155 Commits

Author SHA1 Message Date
Zixaphir
37e43ad19d Fix theme importing #861
note to self: use node.nextElementSibling when assuming the needed
node is an element.
2015-01-16 10:02:21 -07:00
Zixaphir
20d936c1ca Update to ccd0/4chan-x@31c262e531 2015-01-14 08:07:40 -07:00
Zixaphir
1d60413a38 Fix advanced section. 2015-01-13 15:06:11 -07:00
Zixaphir
b102c034a1 Implement ccd0's suboptions 2015-01-13 14:23:53 -07:00
Zixaphir
b0f47e1b3b because why not? 2015-01-12 17:36:23 -07:00
Zixaphir
c2d6039358 muh placebo 2015-01-12 17:35:37 -07:00
Zixaphir
03ec051087 Fix excess colon on settings descriptions 2015-01-12 15:27:45 -07:00
Zixaphir
92af3050aa Fix settings checkboxes 2015-01-11 20:58:51 -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
28f694591d Settings.coffee (and some attached files) 2015-01-09 15:33:57 -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
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
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
Zixaphir
7a9f998a1a Missed one 2014-06-22 08:09:53 -07:00
Zixaphir
64c9c139c1 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/Images/FappeTyme.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
2014-06-22 07:13:41 -07:00
Zixaphir
f103fd0301 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
2014-06-22 07:04:25 -07:00
Mayhem
41c22af15f GM2 incoming! 2014-06-19 04:34:37 +02:00
Zixaphir
2efa358131 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Navigate.coffee
	src/Miscellaneous/CatalogLinks.coffee
	src/Posting/QR.coffee
2014-05-27 12:39:01 -07:00
Zixaphir
37a3b05e39 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	package.json
	src/Archive/archives.json
	src/General/Get.coffee
	src/General/Navigate.coffee
	src/Images/Gallery.coffee
	src/Linkification/Linkify.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
2014-05-11 16:04:14 -07:00
ccd0
50549863f3 add disabled option when Foolz Beta is the only archive 2014-05-10 22:44:28 -07:00
Zixaphir
1238893eae Fix updating of theming content requiring text input on change. 2014-05-03 16:11:52 -07:00
Zixaphir
41ec3933cd Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Navigate.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Posting/QR.coffee
2014-04-19 15:48:11 -07:00
ccd0
6c3a0619f6 remove src, thumb from image links 2014-04-12 21:57:40 -07:00
Zixaphir
33943a06eb Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	css/style.css
	package.json
	src/General/Build.coffee
	src/General/Main.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Monitoring/ThreadUpdater.coffee
2014-04-12 18:13:21 -07:00
Mayhem
c7b7795261 Start supporting new semantics. 2014-04-12 18:01:03 +02:00
Zixaphir
ea47aefd93 Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	CONTRIBUTING.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Settings.html
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/ThreadWatcher.coffee
2014-04-11 00:29:52 -07:00
Zixaphir
28eebe0183 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
2014-04-10 23:08:43 -07:00
Nebukazar
823464ce64 Small fixes
Quote Threading disabled by default
Added missing titles to Header icons
Download Link should now appear in the Menu
2014-04-09 01:57:42 +02:00
Zixaphir
453ebe7e74 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
2014-04-04 20:28:21 -07:00
Zixaphir
f6353729eb Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/FileInfo.coffee
	src/Posting/QR.coffee
2014-04-04 20:24:12 -07:00
Zixaphir
6dcbb80070 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
2014-04-04 16:01:06 -07:00
Zixaphir
e4c395a7cd Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/Images/ImageExpand.coffee
2014-04-04 15:41:15 -07:00
Mayhem
0bc93400c1 .webm #1533 2014-04-05 00:32:44 +02:00
ccd0
1832f124c8 Update archives with data from MayhemYDG fork 2014-04-03 14:52:25 -07:00
Zixaphir
9570834963 Fix hover-descriptions 2014-03-08 17:37:49 -07:00
Mayhem
9127179e0d Nuke the Enable 4chan's Extension setting. 2014-03-07 04:23:01 +01:00
Zixaphir
fe8c67e03e Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Navigate.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Features/Index-navlinks.html
	src/Miscellaneous/CustomCSS.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/QuoteYou.coffee
2014-03-06 20:15:45 -07:00
Zixaphir
db5cccc70f Merge branch 'mayhem' into v3 (Bugtesting time... yey... ;__;)
Conflicts:
	css/burichan.css
	css/futaba.css
	css/photon.css
	css/tomorrow.css
	css/yotsuba-b.css
	css/yotsuba.css
	html/General/Settings-section-Main.html
	html/General/Settings.html
	src/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Settings.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadUpdater.coffee
2014-02-28 19:59:04 -07:00
Mayhem
ac8e05dd22 Simplify import/export of settings.
Also clear all stored data before importing.
2014-02-24 23:56:30 +01:00
Zixaphir
9d95bbea35 Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	css/burichan.css
	css/futaba.css
	css/photon.css
	css/style.css
	css/tomorrow.css
	css/yotsuba-b.css
	css/yotsuba.css
	html/General/Index-navlinks.html
	html/General/Settings-section-Rice.html
	html/General/Settings.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/Recursive.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/lib/$.coffee
	src/General/lib/databoard.class
	src/General/lib/post.class
	src/General/lib/thread.class
	src/Images/ImageExpand.coffee
	src/Images/RevealSpoilers.coffee
	src/Linkification/Linkify.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/IDColor.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.cooldown.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/QuoteCT.coffee
	src/Quotelinks/QuoteOP.coffee
	src/Quotelinks/QuoteStrikeThrough.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee
2014-02-23 14:04:45 -07:00
Mayhem
61510ca272 Add {Post,Thread}::{hide,show}(). Merge reply hiding and thread hiding. 2014-02-22 00:17:47 +01:00
Mayhem
f6f1126130 Quote markers. 2014-02-08 18:05:33 +01:00
Mayhem
1aa467b051 Remove all inline catalog-related code. 2014-01-29 16:25:52 +01:00
Zixaphir
64de010b71 Restore Settings sections. 2014-01-28 01:29:51 -07:00
Zixaphir
1f49ef2212 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/html/Settings/Settings.html
	src/Miscellaneous/AnnouncementHiding.coffee
2014-01-26 11:40:50 -07:00