23 Commits

Author SHA1 Message Date
Jordan Bates
0587155d8b Merge branch 'v3' of git://github.com/zixaphir/appchan-x 2013-04-24 12:14:53 -07:00
Zixaphir
3d6be1c256 Dunno why. 2013-04-24 12:10:33 -07:00
Jordan Bates
c3eab3ab7c Merge Zixaphir/v3 2013-04-24 12:09:21 -07:00
Zixaphir
10590c9c00 Dynamic DOM Flow. 2013-04-24 11:57:26 -07:00
Jordan Bates
c82ad36491 Rice -> Advanced 2013-04-24 11:51:22 -07:00
Jordan Bates
b0fb01b69c Whoops 2013-04-24 11:22:41 -07:00
Jordan Bates
20122d2981 Fix show-board-navigation button 2013-04-24 10:33:47 -07:00
Jordan Bates
b7b95fdc71 Fixes for pull request with latest merge 2013-04-24 02:07:19 -07:00
Zixaphir
a067ad6262 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.js
	src/config.coffee
	src/css/style.css
	src/features.coffee
	src/main.coffee
2013-04-23 23:36:12 -07:00
Jordan Bates
b5318ae864 Add Catalog Settings shortcut 2013-04-23 07:47:50 -07:00
Jordan Bates
505f2b9437 toggle-header-bar -> scroll-marker, also update CSS 2013-04-22 21:41:39 -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