60 Commits

Author SHA1 Message Date
Zixaphir
c141a1973b More rice than you can shake a stick at.
You're gonna need a new rice cooker.
2013-05-10 03:58:24 -07:00
Zixaphir
93b94ec9d0 Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/version
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteInline.coffee
2013-05-06 16:54:39 -07:00
Jordan Bates
dd302fade4 Fix QR dragging without fixed header 2013-05-05 22:37:49 -07:00
Zixaphir
443e48d280 Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/UI.coffee
2013-05-05 15:10:36 -07:00
Zixaphir
8d07da9866 Fix #155 2013-05-05 15:05:10 -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
Zixaphir
bfd879500f Auto-hide. 2013-04-26 14:57:25 -07:00
Jordan Bates
86674a4c86 Merge branch 'v3' of https://github.com/zixaphir/appchan-x 2013-04-26 14:06:45 -07:00
Jordan Bates
09baa3feea Merge Mayhem's structure 2013-04-26 14:04:12 -07:00
Nicolas Stepien
a2e87f1200 Structure.
God damn War Thunder, download faster!
2013-04-26 17:40:51 +02:00