21 Commits

Author SHA1 Message Date
Zixaphir
e37417481e Workaround for old sauce configurations. 2013-05-10 13:43:58 -07:00
Zixaphir
31c3af58aa Some rethinking of how to handle theme and mascots sections. 2013-05-09 00:46:12 -07:00
Zixaphir
4d365b825d Fix FappeTyme always enabled. 2013-05-08 06:06:57 -07:00
Zixaphir
a87ec3a060 More or less improve the mascot section code. 2013-05-08 05:35:52 -07:00
Zixaphir
6c4e4b6b9f Fix various settings tabs and dialogs
* Delete / Undelete Themes and Mascots
* Themes only add [custom] if they're not already User Themes
2013-05-08 04:48:23 -07:00
Zixaphir
c40b978e1f Inherited indices too stronk 2013-05-07 23:54:46 -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
b63e0b9a3f Remove unscroll 2013-05-06 01:26:47 -07:00
Zixaphir
537913542a Fix user css
https://github.com/seaweedchan/4chan-x/issues/51
2013-05-05 22:23:06 -07:00
Zixaphir
cffd5c56dd Fix #226 2013-05-03 09:24:21 -07:00
Zixaphir
ee00d5a3aa Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Features/QuickReply.html
	src/Posting/QuickReply.coffee
2013-05-03 07:17:59 -07:00
Jordan Bates
81d65cc3ca QR doesn't need its own settings section 2013-05-01 02:46:29 -07:00
Mayhem
9183ca0b6a Quick Reply Personas! #330. 2013-05-01 00:28:54 +02: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
Jordan Bates
24700f7736 Switched files around 2013-04-28 10:52:35 -07:00
Jordan Bates
4f779ae64d Merge Mayhem X 2013-04-28 10:37:12 -07:00
Nicolas Stepien
437856be64 Rice section fixes. 2013-04-27 04:42:40 +02:00
Nicolas Stepien
010618a6ef Move some html out the code. 2013-04-27 04:30:31 +02:00
Jordan Bates
ccc090e20c Importing fixes 2013-04-26 15:21:07 -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