4700 Commits

Author SHA1 Message Date
Zixaphir
3852f93f89 I want my offsets back. 2015-01-11 22:38:28 -07:00
Zixaphir
92af3050aa Fix settings checkboxes 2015-01-11 20:58:51 -07:00
Zixaphir
1fdd1ee64f Merge branch 'master' into ccd0merge
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2015-01-11 20:49:25 -07:00
Zixaphir
19bd52341d Reimplement QuoteThreading.disconnect cleanly 2015-01-11 20:45:21 -07:00
Zixaphir
0fa9530d24 Revert "Reimplement QuoteThreading.disconnect()"
This reverts commit 081a5eac2804f0a1488ae0110c6f8ba458b92f96.
2015-01-11 20:44:01 -07:00
Zixaphir
081a5eac28 Reimplement QuoteThreading.disconnect() 2015-01-11 20:29:41 -07:00
ccd0
2ff364defe Also add replies-unread to icon when appropriate (no highlighting by default). 2015-01-11 15:00:08 -08:00
ccd0
9737cb47d5 Highlight thread watcher icon when there are unread replies and the thread watcher is hidden. 2015-01-11 14:47:05 -08:00
ccd0
d189e1beed Merge branch 'Beta' 2015-01-11 13:42:12 -08:00
ccd0
ca65e5ac76 Fix bottom board list after 4chan change. #285 2015-01-11 13:40:01 -08:00
ccd0
240a57c72c Add timer for thread watcher. 2015-01-11 10:51:08 -08:00
Zixaphir
3a9be292d7 Revert "Unread.coffee"
This reverts commit 5f771c943056df582e35d0a2a528a2db5995be31.
2015-01-11 01:05:28 -07:00
Zixaphir
c147589bde Fix Index building. 2015-01-11 00:53:41 -07:00
ccd0
f4ee994bf7 ThreadWatcher: Move parsing code out of anonymous function. 2015-01-10 22:24:26 -08:00
ccd0
c6fcbf5de1 Add Unique ID to archive search menu. 2015-01-10 21:32:55 -08:00
ccd0
501c0c3c62 Revert "Use our own thread excerpt for /pol/ instead of 4chan's."
This reverts commit f302befec7c392108b1640343bc6ec5a38c8d92f.
2015-01-10 20:50:57 -08:00
ccd0
9d7da5817e 4chan X -> meta.name 2015-01-10 19:01:15 -08:00
ccd0
23595c9b64 Remove page number from title in JSON index. 2015-01-10 12:59:46 -08:00
Zixaphir
76b60e4d4d Fix Mascot Settings dialog 2015-01-10 03:35:39 -07:00
Zixaphir
eda8a65132 Fix style settings, incorrect main settings attribute 2015-01-10 02:58:42 -07:00
Zixaphir
54c5b59946 More fixes
Still no header or posts, but no errors either. :D
2015-01-10 02:28:35 -07:00
Zixaphir
872612ad9f Add missing classes 2015-01-10 00:35:27 -07:00
Zixaphir
ada2b5abd0 Small fixes 2015-01-10 00:31:38 -07:00
Zixaphir
409f1f9ecf Finishing up merge, onto testing... 2015-01-09 23:51:32 -07:00
Zixaphir
e4dde07c11 The rest of the QR 2015-01-09 23:31:22 -07:00
Zixaphir
13563ffcda Quick Reply 2015-01-09 23:25:47 -07:00
Zixaphir
4a0377dedf Captcha 2015-01-09 23:00:40 -07:00
Zixaphir
d61a890d2c Unread.coffee 2015-01-09 22:58:58 -07:00
Zixaphir
5f771c9430 Unread.coffee 2015-01-09 22:52:52 -07:00
Zixaphir
ad07b5e345 Fix adplea hiding. 2015-01-09 22:34:48 -07:00
Zixaphir
3d3fc0a868 Finish Miscellaneous features (for now), almost finish Monitoring 2015-01-09 22:21:30 -07:00
Zixaphir
108129ca78 Remembering how keybinds work is hard. 2015-01-09 20:40:02 -07:00
Zixaphir
13d5542997 Keybinds 2015-01-09 20:28:20 -07:00
Zixaphir
f10b3ad9f6 IDHighlight 2015-01-09 20:08:31 -07:00
Zixaphir
2a94bb7150 Update Dice, Fourchan, and IDColor 2015-01-09 20:05:44 -07:00
Zixaphir
32e5eba15d Banners.coffee
Move into Miscellaneous from Theming.
2015-01-09 19:45:56 -07:00
Zixaphir
f158c839aa More merging 2015-01-09 19:38:31 -07:00
Zixaphir
7ecbb84af5 Menus.
Also delete Labels.coffee. Some... weird labeling system for post
hiding that I'm sure no one used. I hope.
2015-01-09 19:15:06 -07:00
Zixaphir
7e4af880e1 I'm just replacing my Linkifier with ccd0/4chan-x's
Instead of manually merging like I've done every other file that
wasn't completely new.
2015-01-09 19:03:16 -07:00
Zixaphir
7075e2cbc0 Delete Video.coffee 2015-01-09 18:58:55 -07:00
Zixaphir
feafb0677f *actually* delete TrashQueue 2015-01-09 18:57:11 -07:00
Zixaphir
7858787516 RevealSpoilers, Sauce, TrashQueue 2015-01-09 18:55:56 -07:00
Zixaphir
edb60f4221 Small typo + return 2015-01-09 18:49:37 -07:00
ccd0
db4b6cf8d2 Revert "Revert "Add link from native catalog to 4chan X catalog. #247""
This reverts commit 98d26d7191e773e919429d55c70fb3ebcc2a079a.
2015-01-09 17:48:12 -08:00
ccd0
a1217506e0 On further consideration, I'd rather not redirect. #247 2015-01-09 17:47:15 -08:00
Zixaphir
67b7d263e2 ImageLoader.coffee 2015-01-09 18:46:05 -07:00
Zixaphir
1c1ec16eef ImageHover.coffee 2015-01-09 18:32:29 -07:00
Zixaphir
4089d56720 ImageExpand.coffee 2015-01-09 18:19:43 -07:00
Zixaphir
bc67db84af Gallery.coffee and ImageCommon.coffee 2015-01-09 17:44:03 -07:00
ccd0
2a24afd27d Fix </a> tag that shouldn't be there. 2015-01-09 16:19:57 -08:00