446 Commits

Author SHA1 Message Date
Zixaphir
0a8719172c I don't know how that happened 2014-01-12 18:14:52 -07:00
Zixaphir
27f052b3e6 Changelog 2014-01-12 18:14:08 -07:00
Zixaphir
aa48ee519c Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
2014-01-12 14:56:32 -07:00
Jordan
1c253782e8 Release 4chan X v1.3.1. 2014-01-12 09:51:00 -07:00
Zixaphir
c13cbfce18 Release appchan x v2.8.0. 2014-01-11 21:33:45 -07:00
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
3aea514ca1 Release 4chan X v1.3.0. 2014-01-10 09:46:48 -07:00
Jordan
436e138895 Merge Zixaphir X 2014-01-09 17:42:57 -07:00
Zixaphir
9478dabdad Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	package.json
	src/General/css/font-awesome.css
2014-01-09 10:12:28 -07:00
Jordan
7eb6849276 Changelog 2014-01-08 22:16:37 -07:00
Zixaphir
63b09cb803 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	package.json
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/css/font-awesome.css
	src/General/lib/databoard.class
	src/Miscellaneous/ExpandThread.coffee
	src/Monitoring/ThreadUpdater.coffee
2014-01-07 20:28:47 -07:00
Jordan
08ae1daee8 Release 4chan X v1.2.45. 2014-01-07 03:17:48 -07:00
Zixaphir
9a8e84c7d1 Release appchan x v2.7.5. 2014-01-04 15:38:05 -07:00
Zixaphir
ccfafab5b0 Release appchan x v2.7.4. 2013-12-27 15:54:19 -07:00
Zixaphir
51c7bfeefb Release appchan x v2.7.3. 2013-12-26 14:44:06 -07:00
Zixaphir
b46e61a8d5 Release appchan x v2.7.2. 2013-12-25 20:38:30 -07:00
Zixaphir
147808a7d4 Release appchan x v2.7.1. 2013-12-24 16:53:43 -07:00
Zixaphir
61a9364090 Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Miscellaneous/CatalogLinks.coffee
2013-12-18 16:58:07 -07:00
Zixaphir
d7ceb42446 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	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/Header.coffee
	src/General/css/font-awesome.css
	src/Miscellaneous/CatalogLinks.coffee
2013-12-18 16:17:11 -07:00
Zixaphir
5d6b357135 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/lib/post.class
2013-12-18 12:21:43 -07:00
Zixaphir
1c55dbd8aa Release appchan x v2.7.0. 2013-12-16 20:21:30 -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
cfbdf1edb5 Release 4chan X v3.15.0. 2013-12-13 14:23:46 +01:00
Mayhem
cf1b6dec3f Changelog. 2013-12-13 01:55:48 +01: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
Mayhem
542803ade0 Release 4chan X v3.14.3. 2013-12-09 11:25:59 +01:00
Mayhem
6396f4a554 Changelog. 2013-12-09 11:25:35 +01:00
Zixaphir
33bc02d8b0 Release appchan x v2.6.4. 2013-12-06 17:31:20 -07:00
Zixaphir
6c47fb300a Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
	src/General/Header.coffee
2013-12-06 17:20:48 -07:00
Jordan Bates
4fd8e6a4bf Release 4chan X v1.2.44. 2013-12-06 17:11:47 -07:00
Zixaphir
adaa09aaaa Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Fix some issues with previous merge.

Conflicts:
	CHANGELOG.md
	package.json
	src/General/Header.coffee
	src/Linkification/Linkify.coffee
2013-12-06 17:11:36 -07:00
Mayhem
cff5f21e39 Release 4chan X v3.14.2. 2013-12-07 00:04:23 +01:00
Mayhem
3efffe8a6e Fix 4chan X for markup change. 2013-12-07 00:03:55 +01:00
Zixaphir
30b6c08922 Release appchan x v2.6.3. 2013-11-27 17:36:31 -07:00
Zixaphir
12adc14ea0 Release appchan x v2.6.2. 2013-11-27 17:18:16 -07:00
Zixaphir
33c8bdc32d Release appchan x v2.6.1. 2013-11-27 17:04:13 -07:00
Zixaphir
89910d43c5 Release appchan x v2.6.0. 2013-11-27 16:32:35 -07:00
Zixaphir
2f7dd5a185 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/script.js
2013-11-26 12:22:13 -07:00
Zixaphir
cadbea75b2 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	package.json
2013-11-26 12:19:19 -07:00
Mayhem
6a9b1a0150 Release 4chan X v3.14.1. 2013-11-25 13:44:43 +01:00
Mayhem
af21becff6 Fix #1347. 2013-11-25 13:21:37 +01: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
7fb48b93d4 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	json/archives.json
2013-11-23 11:17:11 -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
ce0c0c1623 Release 4chan X v3.14.0. 2013-11-21 23:11:32 +01:00
Mayhem
985afb2a1a Support 4cdn. 2013-11-21 23:11:02 +01:00
noface
216dca44ae Add hide header on scroll. Close #1138 2013-11-21 02:10:23 +01:00