358 Commits

Author SHA1 Message Date
Jordan Bates
cea9f7f600 Fix #35 2013-04-29 22:22:52 -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
seaweedchan
4497836e7a Change null styling 2013-04-27 00:22:03 -07:00
Jordan Bates
2689cfb534 z-index 2013-04-26 17:49:12 -07:00
Zixaphir
7f081e8345 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
	builds/crx/script.js
2013-04-26 15:05:38 -07:00
Jordan Bates
70459850c1 Fix thread watcher dragging 2013-04-26 14:59:21 -07:00
Zixaphir
bfd879500f Auto-hide. 2013-04-26 14:57:25 -07:00
Jordan Bates
09baa3feea Merge Mayhem's structure 2013-04-26 14:04:12 -07:00