9 Commits

Author SHA1 Message Date
Zixaphir
30880e499a Merge branch 'v3' into Av2
Conflicts:
	builds/4chan-X.meta.js
	css/style.css
	lib/ui.coffee
	package.json
	src/features.coffee
	src/qr.coffee
2013-04-14 15:36:26 -07:00
Zixaphir
063641106c Fix theme deleting 2013-04-13 22:46:19 -07:00
Zixaphir
19178d86df Finish fixing up settings dialogs for mascots and themes. 2013-04-13 22:35:08 -07:00
Zixaphir
a5b02243e9 Add mascots section to settings. 2013-04-11 23:37:59 -07:00
Zixaphir
06d942a968 Get style settings and theme selection working. 2013-04-10 23:10:55 -07:00
Zixaphir
bf27740fa4 Fix select ricing. 2013-04-09 19:08:31 -07:00
Zixaphir
63e0d44af2 Touchups. 2013-04-09 12:48:13 -07:00
Zixaphir
96b63abc6b Start to get style settings built in. 2013-04-09 12:00:42 -07:00
Zixaphir
d7b644d751 Separate settings into its own file for maintainability. 2013-04-09 07:56:44 -07:00