12 Commits

Author SHA1 Message Date
Jordan Bates
dbdbd8a64c Fix #qr-filerm bringing up file dialog and showing without a file 2013-04-18 07:52:34 -07:00
Jordan Bates
1cd538ac23 Fix giant .captcha-img on refresh 2013-04-18 07:28:10 -07:00
Jordan Bates
a20e10159c Lots of style fixes 2013-04-18 07:11:15 -07:00
Zixaphir
9f8f8efd80 BREAK EVERYTHING INTO PIECES 2013-04-16 19:45:39 -07:00
Zixaphir
599eaef3df Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.js
	src/features.coffee
	src/main.coffee
2013-04-16 18:03:14 -07:00
Zixaphir
991eb1f9cf Add an example to Custom Navigation. 2013-04-16 11:09:16 -07:00
Zixaphir
f66240b860 Merge some appchan x flavor. 2013-04-16 10:42:43 -07:00
Zixaphir
0e103f0526 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	lib/$.coffee
	lib/ui.coffee
	src/config.coffee
	src/features.coffee
	src/main.coffee
	src/qr.coffee

Also added a proper Chrome build. I'mma have to save my pem file...
2013-04-15 23:11:22 -07:00
Zixaphir
85621c4907 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.js
	src/features.coffee
2013-04-14 13:49:33 -07:00
Zixaphir
f098f19a11 Erm, some of that was unnecessary. 2013-04-14 13:10:42 -07:00
Zixaphir
0cd3e95989 Make header more Mayhem-y 2013-04-14 12:29:01 -07:00
Zixaphir
739220ed11 Expose builds/ because botnets. 2013-04-14 01:03:07 -07:00