4251 Commits

Author SHA1 Message Date
Jordan Bates
732320893e Remove auto-update this 2013-04-25 06:45:58 -07:00
Jordan Bates
bf8bfa7dbf re-add ids for stats and updater 2013-04-25 06:33:01 -07:00
Jordan Bates
9c16982c53 Merge branch 'v3' of git://github.com/zixaphir/appchan-x 2013-04-25 06:23:39 -07:00
Zixaphir
38ef5ed257 Race conditions. 2013-04-25 06:23:06 -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
cedd14a040 Add license to grunt file 2013-04-25 05:19:08 -07:00
Jordan Bates
e31944501b Re-add .yourPost per @RiDeag 2013-04-25 04:59:20 -07:00
Jordan Bates
fb8d765e9b Merge branch 'v3' of git://github.com/zixaphir/appchan-x 2013-04-25 04:35:58 -07:00
Jordan Bates
bc638514e5 Remove those awful pointer events 2013-04-25 04:35:33 -07:00
Zixaphir
3ce9bc395f Move the QR out of 4chanXInitFinished and into $.ready 2013-04-25 04:14:11 -07:00
Jordan Bates
93c87664b4 Merge branch 'v3' of git://github.com/zixaphir/appchan-x 2013-04-25 03:34:35 -07:00
Zixaphir
c07d39a11f Seven is a magic number. 2013-04-25 02:23:32 -07:00
Zixaphir
f269690b3e Mite need to rethink a couple of those "4chanXInitFinished" cb()s... 2013-04-25 01:54:39 -07:00
Zixaphir
8362df654c Throttle our first init. 2013-04-25 01:32:08 -07:00
Jordan Bates
d166e9a273 Clarify Hide Unread Count option 2013-04-24 18:12:37 -07:00
Jordan Bates
aa7701f9ca Fix auto-hide QR 2013-04-24 18:03:55 -07:00
Jordan Bates
133c8bd1f9 Merge branch 'v3' of git://github.com/zixaphir/appchan-x 2013-04-24 17:43:48 -07:00
Zixaphir
128a5ef40f Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	src/features.coffee
	src/lib/$.coffee
2013-04-24 17:06:20 -07:00
Jordan Bates
1ccc804c2a Add relevant files 2013-04-24 16:19:28 -07:00
Jordan Bates
b922110a59 Merge branch 'v3' of git://github.com/zixaphir/appchan-x 2013-04-24 15:15:30 -07:00
Zixaphir
186a7e6a5a Fix our ImageExpand scrolling. 2013-04-24 15:14:31 -07:00
Jordan Bates
494b99a9e4 Merge branch 'v3' of git://github.com/zixaphir/appchan-x 2013-04-24 15:06:26 -07:00
Jordan Bates
ccf55a6a73 Change style of poster ids a little 2013-04-24 15:05:57 -07:00
Zixaphir
d7407cfd94 Fix custom navigation on /q/. 2013-04-24 15:02:36 -07:00
Jordan Bates
ca3fc505c3 Re-add Color User IDs 2013-04-24 14:56:14 -07:00
Nicolas Stepien
dcba887954 Don't extend $. 2013-04-24 23:44:06 +02:00
Jordan Bates
7a03d0eedd Add remove spoilers and indicate spoilers 2013-04-24 14:20:25 -07:00
Jordan Bates
b370cd91e3 Merge branch 'v3' of git://github.com/zixaphir/appchan-x 2013-04-24 13:57:45 -07:00
Jordan Bates
6a8a23d353 reloadPkh -> reloadPkg 2013-04-24 13:57:23 -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
66281d22c6 Change QR keybinds 2013-04-24 13:30:54 -07:00
Jordan Bates
a9b5f02626 Update readme 2013-04-24 13:00:52 -07:00
Jordan Bates
eb0386c82f Mayhem's unread scroll fixes 2013-04-24 12:59:07 -07:00
Jordan Bates
867ba2bf0e Style fixes 2013-04-24 12:27:17 -07:00
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
Jordan Bates
fcf5fc5c60 Remove selectadvanced lol 2013-04-24 11:57:39 -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
9ca1806fe8 Custom Board Navigation by default, remove custom nav warning 2013-04-24 10:38:12 -07:00
Jordan Bates
20122d2981 Fix show-board-navigation button 2013-04-24 10:33:47 -07:00
Jordan Bates
2abc54f3de Readd 4chan-X.meta.js 2013-04-24 10:08:40 -07:00
Jordan Bates
d1c26d48e1 4chan x -> 4chan X 2013-04-24 10:05:33 -07:00
Jordan Bates
51f09aa048 Change all meta files 2013-04-24 09:54:23 -07:00
Zixaphir
792284060b Merge pull request #258 from seaweedchan/v3
Fappe Tyme keybind fix, Catalog Settings shortcut, catalog keybind
2013-04-24 07:51:37 -07:00
Nicolas Stepien
d2eda107c4 Fix unread scroll. 2013-04-24 16:27:02 +02:00