1503 Commits

Author SHA1 Message Date
Zixaphir
c6aa15c64d importCSS 2015-01-12 17:04:18 -07:00
Zixaphir
03ec051087 Fix excess colon on settings descriptions 2015-01-12 15:27:45 -07:00
Zixaphir
ba66d077cd Fix classes 2015-01-12 03:00:41 -07:00
Zixaphir
02fd87266e Fix catalog views 2015-01-12 00:11:54 -07:00
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
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
Zixaphir
c147589bde Fix Index building. 2015-01-11 00:53:41 -07: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
13563ffcda Quick Reply 2015-01-09 23:25:47 -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
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
bc67db84af Gallery.coffee and ImageCommon.coffee 2015-01-09 17:44:03 -07:00
Zixaphir
28f694591d Settings.coffee (and some attached files) 2015-01-09 15:33:57 -07: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
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
721c797e3f Update CSS 2015-01-08 12:49:14 -07:00
Zixaphir
181c3c882b Revert "Fix posting on PaleMoon"
This reverts commit 2589a093e3bd22d31d7785aa5e53baf68f1fa3ab.
2014-12-13 04:42:55 -07:00
Zixaphir
2589a093e3 Fix posting on PaleMoon 2014-12-12 04:01:14 -07:00
Zixaphir
168aa98096 Merge @ccd0's capcha changes up to ccd0/4chan-x@bb806b453 2014-12-12 03:03:27 -07:00
Zixaphir
29da4807e4 I installed Pale Moon. 2014-12-09 21:29:03 -07:00
Zixaphir
020a68f73a Merge ccd0's IP Count stuff 2014-12-09 00:28:38 -07:00
Zixaphir
0389bcf930 Merge remote-tracking branch 'origin/master'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-12-08 22:57:37 -07:00
Zixaphir
89cb5a6b6b Merge Recaptcha v2 changes from ccd0/4chan-x 2014-12-08 22:55:49 -07:00
ccd0
ed3ab83c07 also fix a small bug 2014-10-09 12:26:45 -07:00
ccd0
7f920b552f fix privilege escalation vulnerability
Conflicts:
	src/General/Settings.coffee
	src/Quotelinks/QuoteBacklink.coffee
2014-10-09 11:51:41 -07:00
Madotsuki
514b294088 Update Get.coffee
Get.postFromRoot $.x('ancestor::div[@class="thread"]/div', node)
2014-10-01 03:24:46 -05:00
Zixaphir
d564bc2b78 Fix thumbnail server assignment 2014-09-07 16:02:07 -07:00
Zixaphir
ac1c2284f3 Vidya Games a cutie. Close #785 2014-08-24 15:25:48 -07:00
Zixaphir
d0efe4cbab Emoji is kill 2014-08-18 02:15:30 -07:00
Zixaphir
5e8f09b164 Typo 2014-08-17 19:35:39 -07:00
Zixaphir
3581b32994 Try to do some proper error handling on index load
Also, I thought I nuked InfinitScroll.coffee ages ago?
2014-08-17 19:34:17 -07:00
ccd0
673f88b99a relabel email field to options
Conflicts:
	src/General/Config.coffee
	src/Posting/QR.coffee
2014-08-17 19:20:39 -07:00
Zixaphir
ceef9f9edc Fix a bunch of Unread features. 2014-08-17 18:50:21 -07:00
Zixaphir
bc94a3d98c Fix #679 2014-07-31 14:18:15 -07:00
Zixaphir
8ba4898158 Fix an issue where catalog links were affecting external links #773 2014-07-31 14:04:15 -07:00
Zixaphir
9d087ef5d6 Throw 4chanXInitFinished on navigate
Also add "none" flag to Settings.open
$.event("openSettings", "none");
2014-07-30 10:00:10 -07:00
Zixaphir
715cfc7de7 Revert "Kinda sorta make 4chan X Namesync functional"
This reverts commit cb4716bb29c953c69e4c7abc618a4c4d8f6888dc.
2014-07-30 00:04:06 -07:00
Zixaphir
cb4716bb29 Kinda sorta make 4chan X Namesync functional
@milkytiptoe: If you're reading this, I'm open to any suggestions
to facilitate better compatibility between Appchan and Namesync.
2014-07-29 19:26:55 -07:00