Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,169 Commits 2 Branches 0 Tags
Commit Graph

491 Commits

Author SHA1 Message Date
ccd0
9fe486d637 Merge branch 'master' into page1 2014-04-13 01:19:02 -07:00
ccd0
814b64b31c update URLs to 4cdn.org 2014-04-12 22:37:27 -07:00
ccd0
4ecd6f8cfe res -> thread 2014-04-12 21:16:01 -07:00
ccd0
1182047357 more indexing changes 2014-04-12 18:41:05 -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
Zixaphir
4b3f4d1baf Merge branch 'ccd0' into v3 
Conflicts:
	builds/crx.crx
	src/General/Index.coffee
	src/Miscellaneous/Keybinds.coffee
 2014-04-12 18:02:25 -07:00
Mayhem
c7b7795261 Start supporting new semantics. 2014-04-12 18:01:03 +02:00
ccd0
1ee5c11968 restore non-JSON navigation keybinds 2014-04-12 04:03:27 -07: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
ccd0
aedaac2b24 get thread expansion working 2014-04-07 03:32:47 -07:00
Zixaphir
44350c5f76 Fix thread expansion URL 2014-04-06 11:52:20 -07: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
337b43591b Fix webm PDF bug 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-04 16:07:08 -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
372c54068c Fix webm PDF bug 2014-04-04 15:44:11 -07:00
Mayhem
0bc93400c1 .webm #1533 2014-04-05 00:32:44 +02:00
Zixaphir
9f7026e419 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Posting/QR.captcha.coffee
 2014-04-02 17:21:16 -07:00
Zixaphir
393eb3ec22 Lets pretend we're smarter than we really are! 2014-03-30 16:53:08 -07:00
Zixaphir
854c588820 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-24 13:31:42 -07:00
Zixaphir
148edd3e33 Restore Scroll To Post Quoting You functionality. 2014-03-24 13:29:09 -07:00
Zixaphir
b19149cd15 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-14 16:03:17 -07:00
Zixaphir
ca9abdc4e7 Remove Main.callbacknodes 2014-03-14 16:02:19 -07:00
Zixaphir
e459069ae6 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Miscellaneous/InfiniScroll.coffee
	src/Posting/QR.coffee
 2014-03-13 18:12:44 -07:00
Zixaphir
9b9a2980aa Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	README.md
	css/style.css
	html/General/Header.html
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
 2014-03-13 14:30:39 -07:00
Zixaphir
9dec38cb16 Remove InfiniScroll.coffee 
Wasn't using it, thought I'd deleted it already.
 2014-03-13 02:10:09 -07:00
Zixaphir
37f44f71e2 Fix #633 2014-03-11 11:23:54 -07:00
Mayhem
06da6b0c9e Nuke Announcement Hiding setting. 2014-03-10 09:17:33 +01:00
Zixaphir
0a39fff577 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-09 16:04:52 -07:00
Zixaphir
f96e046af4 Change the index mod keybinds. 
These ones are probably even more dumb, though.
 2014-03-09 15:43:30 -07:00
Zixaphir
19cd95cf78 Get rid of more Catalog stuff 2014-03-07 17:12:43 -07:00
Zixaphir
d5fa356e2c Merge branch 'master' of github.com:zixaphir/appchan-x 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-06 20:46:08 -07: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
Brandon
b65db1ba7d switch from .navLinks to .swfSauce on /f/ 
did this to not have it hide when ‘Hide Navlinks’ is enabled
 2014-03-05 22:15:16 -08:00
Brandon
23a82cd795 a few more /f/ tweaks 
It’s almost presentable! 🎈
 2014-03-05 19:51:25 -08:00
Brandon
7dc1f8d600 /f/ cleanup 2014-03-05 13:57:43 -08:00
Brandon
2d3e935a34 Minor fix for /f/ 
Highlighted posts had an overlap with the highlighting and the fileInfo.
 2014-03-05 13:36:10 -08:00
Zixaphir
7c28da181b Fix ExpandThread without JSON Navigation 2014-03-03 12:41:26 -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
Zixaphir
811e3ccaf3 Use our implementation of Navigating between boards 
Our custom navigation should now behave similar to Mayhem's, but
with JSON.
 2014-02-28 18:56:02 -07:00
Mayhem
fba0571efb rm dead code 2014-02-25 04:25:29 +01:00
Mayhem
c3fd98551a Less <i>s. 2014-02-24 20:33:58 +01:00
Mayhem
5c6c0b7bd7 Use FontAwesome for the announcement hiding button. 2014-02-24 19:48:18 +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
Zixaphir
58a3adeedb Small CustomCSS optimization 2014-02-23 08:33:31 -07:00
Zixaphir
8fa130c2df Backport @vampiricwulf's flash features 2014-02-23 08:32:06 -07:00
Zixaphir
5e10d45f4b Give CustomCSS's style sheet an ID 2014-02-23 08:29:27 -07:00
Zixaphir
3a8ccfc237 Move Flash features into their own function 
Also standardize code
 2014-02-23 08:23:11 -07:00
Mayhem
498dfda2ef Update code related to hidden threads. 2014-02-22 00:17:48 +01:00
Mayhem
61510ca272 Add {Post,Thread}::{hide,show}(). Merge reply hiding and thread hiding. 2014-02-22 00:17:47 +01:00