10614 Commits

Author SHA1 Message Date
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
29523443be Revert "Release appchan x v2.9.44."
This reverts commit ac5a6c53b046e3808d8aac1e0482a80fd11d1abd.
2015-01-09 22:56:16 -07:00
Zixaphir
5f771c9430 Unread.coffee 2015-01-09 22:52:52 -07:00
Zixaphir
ac5a6c53b0 Release appchan x v2.9.44. 2015-01-09 22:35:55 -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
ccd0
e61118a5bc Release 4chan X v1.9.19.8. 2015-01-09 18:01:55 -08: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
Zixaphir
28f694591d Settings.coffee (and some attached files) 2015-01-09 15:33:57 -07:00
ccd0
2feb557a09 Release 4chan X v1.9.19.7. 2015-01-09 11:38:28 -08:00
Zixaphir
f86ea6d328 Update Main.coffee 2015-01-08 23:55:24 -07:00
Zixaphir
6080ae3fe5 Index.coffee
UGGHHH, I'm not satisfied with this.
2015-01-08 23:30:40 -07:00
Zixaphir
2dd17b5803 Header.coffee 2015-01-08 22:00:59 -07:00
ccd0
782fe3c690 Revert "Fix quotelinks on /pol/."
This reverts commit ae3e7eaef315e4beda88ef53bbb273c2cbd479be.

Conflicts:
	src/Quotelinks/Quotify.coffee
2015-01-08 19:35:24 -08:00
Zixaphir
2461036a4e Continue merging, cleanup Globals.coffee 2015-01-08 20:35:03 -07:00
Zixaphir
3b097a31f2 Temporarily fix importHTML statements until I get to them. 2015-01-08 16:18:09 -07:00
Zixaphir
7652c1e49b continue quest to merge ccd0 2015-01-08 16:12:21 -07:00
Zixaphir
6f84ae9abe Start merging ccd0's 4chan X stuff 2015-01-08 13:53:38 -07:00
Zixaphir
5449031e60 Merge branch 'master' of github.com:zixaphir/appchan-x
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
2015-01-08 12:49:58 -07:00
Zixaphir
721c797e3f Update CSS 2015-01-08 12:49:14 -07:00
ccd0
3b031ee09e Release 4chan X v1.9.19.6. 2015-01-07 15:10:08 -08:00
ccd0
28011dd203 Add .dance to linkified domains. #157, #281 2015-01-07 15:05:00 -08:00