Zixaphir
34140232fb
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Filtering/ThreadHiding.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/css/font-awesome.css
src/General/lib/notice.class
src/General/meta/metadata.js
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
worksforme.png
2013-11-23 12:56:42 -07:00
Zixaphir
a3c1afa5cd
Merge -- probably bugged until I sort out everything
...
that's actually changed. Honestly, all I wanted was the
4cdn changes, but any excuse to merge was good enough, I guess.
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
Gruntfile.coffee
changelog-old
css/style.css
html/General/Settings.html
html/Monitoring/ThreadUpdater.html
html/Monitoring/ThreadWatcher.html
html/Posting/QR.html
package.json
src/Filtering/ThreadHiding.coffee
src/General/Build.coffee
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/lib/post.class
src/General/meta/manifest.json
src/Images/ImageExpand.coffee
src/Meta/banner.js
src/Miscellaneous/ExpandComment.coffee
src/Miscellaneous/ExpandThread.coffee
src/Miscellaneous/Keybinds.coffee
src/Miscellaneous/Nav.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadStats.coffee
src/Monitoring/ThreadUpdater.coffee
src/Monitoring/ThreadWatcher.coffee
src/Monitoring/Unread.coffee
src/Posting/QuickReply.coffee
2013-11-22 17:25:06 -07:00
Mayhem
bc72f0f763
Create importHTML function, and use it.
2013-11-02 19:21:05 +01:00
Zixaphir
d4a3bc8a17
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Settings.coffee
src/General/css/font-awesome.css
src/Images/FappeTyme.coffee
src/Images/Gallery.coffee
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
2013-08-24 13:57:27 -07:00
Zixaphir
ccc0335b79
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
LICENSE
css/style.css
html/Monitoring/ThreadWatcher.html
json/archives.json
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/img/favicons/empty.gif
src/Linkification/Linkify.coffee
src/Miscellaneous/ExpandComment.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Monitoring/Unread.coffee
src/Posting/QuickReply.coffee
2013-08-22 12:10:33 -07:00
Mayhem
7cd4b7cee0
Use FontAwesome to replace the thread watcher toggle icon.
2013-08-20 17:06:23 +02:00
Zixaphir
72e3fc2585
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
builds/appchan-x.user.js
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Config.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/html/Features/QuickReply.html
src/General/img/favicons/xat-/unreadDead.png
src/General/img/favicons/xat-/unreadDeadY.png
src/General/img/favicons/xat-/unreadNSFW.png
src/General/img/favicons/xat-/unreadNSFWY.png
src/General/img/favicons/xat-/unreadSFW.png
src/General/img/favicons/xat-/unreadSFWY.png
src/General/meta/banner.js
src/General/meta/metadata.js
src/Images/ImageExpand.coffee
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
src/Posting/QuickReply.coffee
2013-08-18 11:17:07 -07:00
Zixaphir
d15f8ee728
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
...
Conflicts:
CHANGELOG.md
Gruntfile.coffee
LICENSE
css/style.css
html/Posting/QR.html
img/changelog/3.2.0/0.png
package.json
src/General/Get.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/Notice.coffee
src/General/Notification.coffee
src/General/Settings.coffee
src/General/img/icon.gif
src/General/lib/notification.class
src/Monitoring/Favicon.coffee
src/Posting/QuickReply.coffee
src/Quotelinks/QuoteOP.coffee
2013-08-17 20:33:48 -07:00
Mayhem
43fbf62da0
Add the 4chan X logo to desktop notifications.
2013-08-17 19:02:04 +02:00
Zixaphir
bc501dc022
Merge branch 'v3'
...
Conflicts:
.gitignore
CHANGELOG.md
LICENSE
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/Filtering/PostHiding.coffee
src/Filtering/ThreadHiding.coffee
src/General/Header.coffee
src/General/Main.coffee
src/General/html/Monitoring/ThreadWatcher.html
src/Images/ImageExpand.coffee
src/Menu/Menu.coffee
src/Posting/QuickReply.coffee
2013-08-15 23:02:54 -07:00
seaweedchan
875f0cd4f8
Merge Zixaphir X
2013-08-12 00:07:39 -07:00
Zixaphir
1debf61f2e
Merge branch 'v3'
...
Conflicts:
CHANGELOG.md
LICENSE
builds/4chan-X.js
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx/manifest.json
builds/crx/script.js
latest.js
package.json
src/General/Header.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/css/burichan.css
src/General/css/futaba.css
src/General/css/photon.css
src/General/css/style.css
src/General/css/tomorrow.css
src/General/css/yotsuba-b.css
src/General/css/yotsuba.css
src/General/html/Settings/Advanced.html
src/Monitoring/Favicon.coffee
src/Monitoring/ThreadWatcher.coffee
2013-05-14 11:40:38 -07:00
Jordan Bates
4b0b8df894
Change watcher icon to heart
2013-05-14 07:46:25 -07:00
Zixaphir
77433f5da8
Merge branch 'v3' into Av2
...
Conflicts:
builds/4chan-X.js
builds/4chan-X.meta.js
builds/4chan-X.user.js
builds/crx.crx
builds/crx/manifest.json
builds/crx/script.js
package.json
src/General/Config.coffee
src/General/Main.coffee
src/General/Settings.coffee
src/General/css/burichan.css
src/General/css/futaba.css
src/General/css/photon.css
src/General/css/style.css
src/General/css/tomorrow.css
src/General/css/yotsuba-b.css
src/General/css/yotsuba.css
src/General/img/favicons/Original/unreadDead.gif
src/General/img/favicons/Original/unreadNSFW.gif
src/General/img/favicons/Original/unreadSFW.gif
src/General/img/favicons/dead.gif
src/General/img/favicons/empty.gif
src/General/img/favicons/ferongr/unreadDead.gif
src/General/img/favicons/ferongr/unreadNSFW.gif
src/General/img/favicons/ferongr/unreadSFW.gif
src/General/meta/metadata.js
src/Miscellaneous/AnnouncementHiding.coffee
src/Miscellaneous/Keybinds.coffee
src/Monitoring/ThreadStats.coffee
src/Monitoring/ThreadUpdater.coffee
src/Posting/QuickReply.coffee
src/features/misc/header.coffee
src/features/monitoring/favicon.coffee
2013-04-28 21:20:22 -07:00
Jordan Bates
e70514b6ec
Finish structure
2013-04-26 14:43:01 -07:00
Jordan Bates
09baa3feea
Merge Mayhem's structure
2013-04-26 14:04:12 -07:00
Nicolas Stepien
a2e87f1200
Structure.
...
God damn War Thunder, download faster!
2013-04-26 17:40:51 +02:00
