247 Commits

Author SHA1 Message Date
Zixaphir
33bc02d8b0 Release appchan x v2.6.4. 2013-12-06 17:31:20 -07: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
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
Mayhem
a907fa665d Release 4chan X v3.13.0. 2013-11-16 21:23:17 +01:00
Mayhem
c318fb37b9 Update deps. 2013-11-16 15:51:07 +01:00
Jordan Bates
b9a0d453db Release 4chan X v1.2.43. 2013-11-10 23:36:52 -07:00
Mayhem
6975a766b9 Update font-awesome. 2013-11-07 22:34:41 +01:00
Mayhem
5db85bc454 Release 4chan X v3.12.1. 2013-11-04 19:51:51 +01:00
Mayhem
b94a6327ab Release 4chan X v3.12.0. 2013-11-03 21:15:15 +01:00
Mayhem
a22bce79ab Warn users about outdated versions of Greasemonkey. 2013-11-02 19:20:28 +01:00
Mayhem
4ff5fd287a Update FontAwesome. 2013-10-23 21:13:10 +02:00
Mayhem
cbd01e9fb9 Update deps. 2013-10-23 20:21:18 +02:00
Jordan Bates
528f95d5f5 Release 4chan X v1.2.42. 2013-10-22 18:27:12 -07:00
Zixaphir
0224a5c0cc Release appchan x v2.5.1. 2013-10-20 00:16:05 -07:00
Zixaphir
dfb0ad23df Release appchan x v2.5.0. 2013-10-19 22:58:33 -07:00
Zixaphir
5900490e63 Release appchan x v2.4.1. 2013-10-13 17:59:58 -07:00
Zixaphir
add2019705 Release appchan x v2.4.0. 2013-10-13 15:17:25 -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
91cedb3b89 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	html/General/Settings-section-Rice.html
	img/changelog/3.9.0/0.png
	package.json
	src/Images/AutoGIF.coffee
	src/Images/RevealSpoilers.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/IDColor.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteInline.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee
2013-10-13 13:53:38 -07:00
seaweedchan
26a0c27ac3 Release 4chan X v1.2.41. 2013-10-03 16:49:16 -07:00
Mayhem
b1db179af9 Release 4chan X v3.11.5. 2013-10-03 18:13:05 +02:00
Mayhem
1bd09b2270 Update deps. 2013-10-02 11:19:52 +02: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
Mayhem
f486cf43d5 Release 4chan X v3.11.4. 2013-09-23 14:59:05 +02:00
seaweedchan
c6d5c0c463 Release 4chan X v1.2.40. 2013-09-22 04:45:33 -07:00
seaweedchan
6d4da42eb2 Merge Mayhem X 2013-09-22 03:57:03 -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
Mayhem
acffb4b7de Update deps. 2013-09-20 11:26:46 +02:00
Jordan Bates
4ee4856a78 Release 4chan X v1.2.39. 2013-09-19 11:30:50 -07:00
Jordan Bates
871dd7582b Release 4chan X v1.2.38. 2013-09-19 07:38:43 -07:00
Mayhem
15a51d2344 Release 4chan X v3.11.3. 2013-09-19 14:22:53 +02:00
Mayhem
93c297b324 Release 4chan X v3.11.2. 2013-09-17 09:51:21 +02:00
Mayhem
8dc39192dd Release 4chan X v3.11.1. 2013-09-13 17:05:12 +02:00
Jordan Bates
decfb32948 Release 4chan X v1.2.37. 2013-09-12 16:38:59 -07:00
Mayhem
2f2aedb70e Release 4chan X v3.11.0. 2013-09-06 15:20:17 +02:00
Zixaphir
fa569e5451 Release appchan x v2.3.10. 2013-08-31 10:17:11 -07:00
Zixaphir
75c7ef73cd Release appchan x v2.3.9. 2013-08-30 19:35:57 -07:00
Jordan Bates
bc0f30612c Release 4chan X v1.2.36. 2013-08-26 21:04:35 -07:00
Zixaphir
ace2f6384f Release appchan x v2.3.8. 2013-08-25 12:59:16 -07:00
Zixaphir
43d010bc8a Release appchan x v2.3.7. 2013-08-25 11:50:04 -07:00
Mayhem
132d94d441 Release 4chan X v3.10.0. 2013-08-22 13:21:37 +02:00
Zixaphir
a48e80ff5a Release appchan x v2.3.6. 2013-08-21 13:17:52 -07:00