13 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
7eb6849276 Changelog 2014-01-08 22:16:37 -07:00
Zixaphir
1df5442483 changelog image 2013-08-21 13:18:30 -07:00
Zixaphir
298b5d3270 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
2013-08-16 03:39:33 -07:00
seaweedchan
109699d83a More optimizations + changelog 2013-08-16 02:24:24 -07: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
5a46958ab2 Update changelog 2013-08-14 05:17:43 -07:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
Zixaphir
c4a008f402 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css
2013-05-10 07:19:08 -07:00
Jordan Bates
281bedb693 png 2013-05-10 05:24:03 -07:00
Jordan Bates
72eab323da Release 4chan X v1.2.0. 2013-05-10 05:22:01 -07:00
Zixaphir
d8db801341 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/html/Settings/Advanced.html
2013-05-10 04:58:26 -07:00
Jordan Bates
1dc8762747 Add image to changelog 2013-05-09 05:37:06 -07:00