Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kiwiirc/kiwiirc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: freenode/kiwiirc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Jun 11, 2018

  1. Copy the full SHA
    2911deb View commit details

Commits on Jun 12, 2018

  1. Userbox scrolling

    prawnsalad authored and tomaw committed Jun 12, 2018
    Copy the full SHA
    8419cf2 View commit details
  2. Copy the full SHA
    8947dde View commit details
  3. Copy the full SHA
    6fb5b89 View commit details

Commits on Jun 25, 2018

  1. Copy the full SHA
    de5845d View commit details
  2. Copy the full SHA
    56be630 View commit details
  3. Copy the full SHA
    4fde8ec View commit details
  4. Fix code style

    ItsOnlyBinary authored and tomaw committed Jun 25, 2018
    Copy the full SHA
    f518161 View commit details
  5. Copy the full SHA
    321c06f View commit details
  6. Copy the full SHA
    3e0ce4d View commit details
  7. - Removed duplicate border radius

    AllanOcelot authored and tomaw committed Jun 25, 2018
    Copy the full SHA
    9d5c57f View commit details
  8. network.connect() helper function

    prawnsalad authored and tomaw committed Jun 25, 2018
    Copy the full SHA
    5c8d38c View commit details
  9. Copy the full SHA
    c184bb8 View commit details
  10. - Removed global close icons from the dark and default theme

    - Placed global close icons in global css, where they belong
    - Started linting the theme files ( In progress)
    AllanOcelot authored and tomaw committed Jun 25, 2018
    Copy the full SHA
    a711e17 View commit details
  11. Update irc-framework to v3

    prawnsalad authored and tomaw committed Jun 25, 2018
    Copy the full SHA
    784d6cd View commit details
  12. Copy the full SHA
    4f5d2ea View commit details
  13. Copy the full SHA
    f5b078e View commit details
  14. Add html formatting to topic popdown

    ItsOnlyBinary authored and tomaw committed Jun 25, 2018
    Copy the full SHA
    213732f View commit details
  15. Full dates on message hover

    prawnsalad authored and tomaw committed Jun 25, 2018
    Copy the full SHA
    669be59 View commit details
  16. Copy the full SHA
    bc21f05 View commit details

Commits on Jul 8, 2018

  1. Merge ../kiwiirc

    # Conflicts:
    #	src/components/ContainerHeader.vue
    #	src/components/MessageList.vue
    #	src/components/NotConnected.vue
    #	src/components/ServerView.vue
    #	src/components/StateBrowser.vue
    #	src/components/startups/Personal.vue
    #	src/helpers/TextFormatting.js
    #	src/libs/InputHandler.js
    #	src/libs/state.js
    #	static/themes/dark/theme.css
    prawnsalad committed Jul 8, 2018
    Copy the full SHA
    cf1bc30 View commit details

Commits on Jul 15, 2018

  1. Add freenode specific images

    tomaw committed Jul 15, 2018
    Copy the full SHA
    dae78c6 View commit details

Commits on Jul 17, 2018

  1. Merge pull request #14 from kiwiirc/master

    Update to kiwiirc master
    tomaw authored Jul 17, 2018
    Copy the full SHA
    00a8928 View commit details

Commits on Mar 11, 2019

  1. freenode specific index

    tomaw committed Mar 11, 2019
    Copy the full SHA
    5b0bed9 View commit details
  2. Copy the full SHA
    079b0b0 View commit details

Commits on Mar 14, 2019

  1. Copy the full SHA
    edf9ccd View commit details

Commits on Jun 23, 2019

  1. Copy the full SHA
    c0f246b View commit details
  2. Merge branch 'master' of github.com:kiwiirc/kiwiirc into update

    # Conflicts:
    #	index.html
    prawnsalad committed Jun 23, 2019
    Copy the full SHA
    7b24b95 View commit details
  3. Copy the full SHA
    9379851 View commit details
  4. Copy the full SHA
    5a6390e View commit details

Commits on Jun 25, 2019

  1. Cleanup index.html

    tomaw committed Jun 25, 2019
    Copy the full SHA
    78fe318 View commit details
  2. Include plugin here for ease

    tomaw committed Jun 25, 2019
    Copy the full SHA
    0a82cfe View commit details

Commits on Jun 26, 2019

  1. Disable the /dice command

    prawnsalad committed Jun 26, 2019
    Copy the full SHA
    c86fcc4 View commit details

Commits on Jun 30, 2019

  1. Merge pull request #17 from kiwiirc/master

    Resync with upstream
    tomaw authored Jun 30, 2019
    Copy the full SHA
    bfd41fd View commit details

Commits on Jul 1, 2019

  1. Fix sponsorlink showing outside of connect form

    102% gives some spacing above the sponsor link which is nicer to look at, but 100% works as well
    swantzter authored Jul 1, 2019
    Copy the full SHA
    4b9baa7 View commit details

Commits on Aug 10, 2019

  1. Merge pull request #18 from svbeon/patch-2

    Fix sponsorlink showing outside of connect form
    tomaw authored Aug 10, 2019
    Copy the full SHA
    ef66603 View commit details

Commits on Aug 30, 2019

  1. Merge pull request #21 from kiwiirc/master

    Update to upstream master
    tomaw authored Aug 30, 2019
    Copy the full SHA
    cdeec27 View commit details

Commits on Sep 1, 2019

  1. Copy the full SHA
    9daad13 View commit details
  2. Fix PIA sponsor message

    tomaw committed Sep 1, 2019
    Copy the full SHA
    6b2e9ec View commit details
  3. Copy the full SHA
    86672eb View commit details
  4. Index wording changes

    tomaw committed Sep 1, 2019
    Copy the full SHA
    f45cbe4 View commit details

Commits on Sep 26, 2019

  1. Copy the full SHA
    7b95c31 View commit details

Commits on Jul 10, 2020

  1. Copy the full SHA
    7317a49 View commit details
  2. Copy the full SHA
    2c221bd View commit details
  3. Merge pull request #23 from swantzter/patch-3

    prevent freenode logo on connection screen from overflowing
    Tom Wesley authored Jul 10, 2020
    Copy the full SHA
    2b30aca View commit details

Commits on Sep 18, 2020

  1. Update Page Title

    closes #24
    swantzter authored Sep 18, 2020
    Copy the full SHA
    23191d4 View commit details

Commits on Sep 19, 2020

  1. Copy the full SHA
    a3dd333 View commit details

Commits on Oct 14, 2020

  1. Copy the full SHA
    96483d2 View commit details

Commits on Oct 25, 2020

  1. Copy the full SHA
    27ea81c View commit details

Commits on Jan 9, 2021

  1. Merge pull request #25 from swantzter/patch-4

    Update Page Title
    Tom Wesley authored Jan 9, 2021
    Copy the full SHA
    6b45aa6 View commit details
103 changes: 74 additions & 29 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,35 +1,80 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
<link rel="icon" type="image/png" href="static/favicon.png">
<title>Kiwi IRC</title>
<style>
/* target specific styles */
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="user-scalable=no,width=device-width,initial-scale=1,maximum-scale=1"><link rel=icon type=image/png href=static/favicon.png><title>freenode's webchat</title><style>/* target specific styles */
body {
/* disable the 'pull down to refresh' on mobiles */
overflow: hidden;
}
.kiwi-noscript-warn {
text-align: center;
font-weight: bold;
padding: 1em;
}
</style>
<style class="embedly-css">
.card .hdr {
}</style><style class=embedly-css>.card .hdr {
display:none;
}</style></head><body><div id=app></div>



<script>
console.log('Start');
window.kiwiConfig = function() {
var conf = {
"windowTitle": "freenode's webchat",
"startupScreen": "welcome",
"kiwiServer": "https://kiwi.freenode.net/relay/kiwiirc/",
"restricted": true,
"theme": "Default",
"themes": [
{ "name": "Default", "url": "static/themes/default" },
{ "name": "Dark", "url": "static/themes/dark" },
{ "name": "Coffee", "url": "static/themes/coffee" },
{ "name": "GrayFox", "url": "static/themes/grayfox" },
{ "name": "Nightswatch", "url": "static/themes/nightswatch" },
{ "name": "Osprey", "url": "static/themes/osprey" },
{ "name": "Radioactive", "url": "static/themes/radioactive" },
{ "name": "Sky", "url": "static/themes/sky" }
],
"startupOptions" : {
"server": "irc.freenode.net",
"port": 6667,
"tls": false,
"direct": false,
"recaptchaSiteId": "6LfbMFoUAAAAAACGY2SGxbZ6R-dCnL1g5lZB2Pei",
"channel": "",
"nick": "",
"greetingText": "freenode IRC",
"infoBackground": "static/plugins/freenode/sunny.jpg",
"infoContent": "<img src=\"static/plugins/freenode/fn-logo.svg\"><p>You have stumbled upon the <a href=\"https://kiwiirc.com\">Kiwi</a> Webchat for the freenode project.<br> To learn more about the freenode IRC network, the freenode #live conference and other freenode projects head over to <a href=\"https://freenode.net\">our website</a>.</p><p></p>",
"allowNoChannel": true
},
"buffers": {
"inline_link_auto_previews": false
},
"embedly": {
"key": ""
},
"plugins": [
{"name": "freenode", "url": "static/plugins/freenode/freenode.js"}
]
};

var fragment;
if (window.location.hash && window.location.hash.indexOf('%') > -1) {
// Channel has some decoded characters
fragment = decodeURIComponent(window.location.hash.substring(1));
} else if (window.location.hash) {
fragment = window.location.hash;
}
if (fragment) {
var qmindex = fragment.indexOf('?');
if (qmindex > -1) {
var uparam = fragment.substring(qmindex + 1).match(/nick=([^&;]+)/);
fragment = fragment.substring(0, qmindex);
if (uparam) {
conf.startupOptions.nick = uparam[1];
}
}
</style>
</head>
<body>
<noscript>
<div class="kiwi-noscript-warn">
Please enable JavaScript and refresh the page to use this website.
</div>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
</body>
conf.startupOptions.channel = fragment;
window.location.hash = fragment;
}

return conf;
};
</script>


</body>
</html>
1 change: 1 addition & 0 deletions static/img/fn-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/img/sunny.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions static/plugins/freenode/fn-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions static/plugins/freenode/freenode.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.kiwi-startup-common-section-info-content img {
max-width: 90%;
}
19 changes: 19 additions & 0 deletions static/plugins/freenode/freenode.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
kiwi.plugin('freenode', function(kiwi, log) {
kiwi.once('ready', function(event) {
var link = document.createElement("link");
link.type = "text/css";
link.rel = "stylesheet";
link.href = "static/plugins/freenode/freenode.css";
document.head.appendChild(link);
console.debug('added');
});

// Disable the /dice command
kiwi.on('input.command.dice', function(e){
e.handled = true;
var net = kiwi.state.getActiveNetwork();
if (net) {
net.ircClient.raw(e.command + ' ' + e.params);
}
});
});
Binary file added static/plugins/freenode/sunny.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.