15 Commits

Author SHA1 Message Date
Zixaphir
de26c643b2 Merge branch 'v3' into Av2
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/css/style.css
	src/features/filtering/replyhiding.coffee
	src/features/filtering/threadhiding.coffee
	src/features/misc/header.coffee
	src/settings.coffee
2013-04-22 23:48:42 -07:00
Jordan Bates
505f2b9437 toggle-header-bar -> scroll-marker, also update CSS 2013-04-22 21:41:39 -07:00
Zixaphir
3d07017708 Merge branch 'v3' into Av2
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/config.coffee
	src/css/style.css
	src/features/misc/announcementhiding.coffee
	src/features/misc/header.coffee
	src/features/misc/keybinds.coffee
	src/main.coffee
	src/settings.coffee
2013-04-22 21:41:24 -07:00
Jordan Bates
8310ccecb9 Settings changes 2013-04-22 20:52:26 -07:00
Zixaphir
9e8e206157 Fix catalog links issues. 2013-04-22 13:38:13 -07:00
Zixaphir
305490fc79 Merge pull request #252 from seaweedchan/v3
Add Footer Navigation toggling
2013-04-22 13:03:26 -07:00
Jordan Bates
11ad47503e Add board-replace 2013-04-22 04:33:15 -07:00
Jordan Bates
8bb52b9bcc Add Footer Navigation toggling 2013-04-22 03:08:40 -07:00
Zixaphir
0b802fdd56 Console errors are icky. 2013-04-22 02:41:18 -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
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