6 Commits

Author SHA1 Message Date
Zixaphir
7a58008d0c Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/Miscellaneous/Emoji.coffee
2013-10-19 19:54:09 -07:00
Zixaphir
f1d1aca203 Fix some things. 2013-08-08 15:49:00 -07:00
Zixaphir
7b41b3baa3 Eliminate unnecessary whitespace in compiled CSS. 2013-08-06 18:45:42 -07:00
Zixaphir
191aec36ad Rethink Emoji. 2013-06-06 07:19:46 -07:00
Zixaphir
3bb8bd0230 Fucking Emoji. 2013-04-28 21:52:21 -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