155 Commits

Author SHA1 Message Date
Zixaphir
bd08bd964d Merge branch 'json' into ajson
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-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/Index.coffee
	src/General/Main.coffee
	src/General/css/font-awesome.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Features/Index-navlinks.html
	src/General/html/Monitoring/ThreadWatcher.html
	src/Images/Gallery.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QR.coffee
2014-01-11 15:55:46 -07:00
Jordan
ce5a6f2552 Shortcut icons now default 2014-01-08 21:14:21 -07:00
Zixaphir
c36d62d5ce Cleanup and fix remaining issues from seaweedchan/4chan-x#212 2013-12-18 12:15:13 -07:00
Zixaphir
5f0717ff57 Merge branch 'v3' 2013-12-16 20:08:10 -07:00
Zixaphir
ed84637551 Post without name keybind? close #491 2013-12-16 19:23:14 -07:00
Zixaphir
7958371a24 I have no idea how I enabled that by default. I == dumb 2013-12-16 18:29:45 -07:00
Zixaphir
e156cc8e9c Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/script.js
	src/General/Config.coffee
	src/Images/FappeTyme.coffee
	src/Linkification/Linkify.coffee
2013-12-16 14:01:47 -07:00
Zixaphir
545a1f346f "Fix" Fappe/Werk Tyme and actually fix Werk Tyme. 2013-12-16 13:36:19 -07:00
Zixaphir
a719bbde38 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Config.coffee
2013-12-16 12:56:09 -07:00
Mayhem
ceff7c5d5f Add Refreshed Navigation setting.
Close #1323, #1332.
2013-12-12 02:03:18 +01:00
Mayhem
f17f9fd441 Anchor hidden threads on the index. 2013-12-12 02:03:18 +01:00
Zixaphir
89910d43c5 Release appchan x v2.6.0. 2013-11-27 16:32:35 -07:00
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
noface
216dca44ae Add hide header on scroll. Close #1138 2013-11-21 02:10:23 +01:00
Mayhem
8afcac8d6f Add the Show replies index setting. 2013-11-16 15:57:47 +01:00
Mayhem
a8209eaa89 Add index searching. Close #1318 2013-11-16 15:57:46 +01:00
Mayhem
d00597f53d Remove comment expansion-related code. 2013-11-02 19:21:06 +01:00
Mayhem
092d9317e0 Add sorting options by bump order and creation date. 2013-11-02 19:21:04 +01:00
Mayhem
1996fc4351 Add all-pages index navigation. Close #1133 2013-11-02 19:21:03 +01:00
Mayhem
ef38269981 Initial work for index navigation improvements. 2013-11-02 19:21:02 +01:00
NoneGiven
2bcb79625f Update Config.coffee 2013-10-22 20:46:07 -05:00
NoneGiven
bf0ea30fdc New keybind: catalog search box.
Close #1306, #1297.
2013-10-22 22:16:27 +02:00
Zixaphir
4f50fd300d Infinite Scrolling
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
2013-10-19 19:45:35 -07:00
Zixaphir
966a07ca20 Infinite Scrolling 2013-10-19 19:41:49 -07:00
Zixaphir
904316e4e0 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
2013-10-13 14:42:58 -07:00
Zixaphir
0415de74c1 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/html/Build/post.html
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
2013-10-13 14:29:52 -07:00
Zixaphir
7812001d96 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css
	src/Posting/QuickReply.coffee
2013-09-24 14:46:24 -07:00
Zixaphir
847078db53 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	json/archives.json
	package.json
	src/Filtering/Anonymize.coffee
	src/General/Config.coffee
	src/General/lib/post.class
	src/Linkification/Linkify.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
2013-09-20 05:45:04 -07:00
Jordan Bates
3470929e05 Merge some mayhem changes 2013-09-19 07:27:53 -07:00
Mayhem
dcae343687 Remove some sage-related code that is not relevant anymore. 2013-09-19 11:43:50 +02:00
Zixaphir
2efd32a0a6 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css
2013-08-30 19:35:10 -07:00
Jordan Bates
a62323915d Gallery tweaks
Also fix hide thumbnails
2013-08-25 17:12:00 -07:00
Zixaphir
1450e61369 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/style.css
	src/Images/Gallery.coffee
2013-08-25 10:11:46 -07:00
Zixaphir
9353bcd50d Separate Gallery and Image Expansion fit width / height 2013-08-25 08:47:09 -07:00
seaweedchan
6598b5a45e Merge Zixaphir X 2013-08-25 01:15:47 -07: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
c4fdaea615 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	css/style.css
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/lib/post.class
	src/Posting/QuickReply.coffee
2013-08-24 13:08:23 -07:00
Zixaphir
dc0b4d3d41 Keybinds, Werk Tyme, more Mayhem-X-like IDColor 2013-08-24 11:24:49 -07:00
Zixaphir
8c1ac1710a Gallery stuff. 2013-08-23 14:37:20 -07:00
NoneGiven
cb498db8df Typo
It just werx
2013-08-23 02:04:19 +02:00
noface
01146f85c5 Close #1255. 2013-08-23 01:04:44 +02:00
Zixaphir
8e4d88eb16 Port Appchan's Gallery 2013-08-22 12:28:55 -07:00
Zixaphir
b55cda889e Enable Gallery by default 2013-08-22 10:45:41 -07:00
Zixaphir
3e2bfee617 Pretty much finish up the Gallery 2013-08-20 09:04:56 -07:00
Zixaphir
1cf8b0fe9e Werk Tyme 2013-08-20 01:11:32 -07:00
Mayhem
4196ce2600 Clean links from spoiler and code tags. 2013-08-20 00:33:56 +02:00
Jordan Bates
a1ad605f9e Disable notifications 2013-08-18 21:09:03 -07:00
noface
202d7617e3 Add Linkification. 2013-08-18 20:53:08 +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