22 Commits

Author SHA1 Message Date
Jordan Bates
cffc09145e Merge Zixaphir X 2013-04-26 12:50:32 -07:00
Zixaphir
591874dc64 Fix Advanced Tab. 2013-04-26 12:38:50 -07:00
Jordan Bates
f038479df0 Fix typo 2013-04-25 09:54:14 -07:00
Jordan Bates
9c7dcc0165 Small style fix 2013-04-25 09:52:15 -07:00
Jordan Bates
663dbe3bb2 Merge Zixaphir X 2013-04-25 06:01:36 -07:00
Zixaphir
030711c586 Move updater and thread stats into header. 2013-04-25 05:59:54 -07:00
Jordan Bates
1ccc804c2a Add relevant files 2013-04-24 16:19:28 -07:00
Zixaphir
3e5c99cd15 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-24 13:52:16 -07:00
Zixaphir
89830abdb7 Emoji. 2013-04-24 13:50:38 -07:00
Jordan Bates
c82ad36491 Rice -> Advanced 2013-04-24 11:51:22 -07:00
Jordan Bates
9ca1806fe8 Custom Board Navigation by default, remove custom nav warning 2013-04-24 10:38:12 -07:00
Jordan Bates
a992283459 Simpler export/import links 2013-04-22 21:21:05 -07:00
Jordan Bates
8310ccecb9 Settings changes 2013-04-22 20:52:26 -07:00
Zixaphir
4d45142345 Redirect.to, modularized. 2013-04-22 18:25:30 -07:00
Jordan Bates
11ad47503e Add board-replace 2013-04-22 04:33:15 -07:00
Zixaphir
4856a6778d Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	.gitignore
	Gruntfile.js
	src/config.coffee
	src/css/style.css
	src/features.coffee
	src/features/posting/qr.coffee
2013-04-22 01:24:11 -07:00
Zixaphir
f295c5842e Header changes. 2013-04-21 23:48:04 -07:00
Zixaphir
e0dbc28e3c Update Config and Quote Threading. 2013-04-21 22:37:30 -07:00
Zixaphir
4d25b6ff3a Move Catalog Links into the Header Menu. 2013-04-21 21:32:03 -07:00
Zixaphir
29b1f20387 Actually, I don't need to remove it to not support it. 2013-04-21 20:20:24 -07:00
Zixaphir
17d7967551 I refuse to support 4chanJS. 2013-04-21 19:32:56 -07:00
Zixaphir
6257982bf0 code > features 2013-04-21 17:49:35 -07:00