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

231 Commits

Author SHA1 Message Date
Zixaphir
523d6bd9c4 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Build.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Navigate.coffee
	src/General/css/style.css
	src/General/html/Build/post.html
	src/General/html/Features/Index-navlinks.html
	src/General/lib/post.class
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/Banner.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/Quotify.coffee
 2014-05-03 02:03:35 -07:00
Zixaphir
ca9b0517de Merge some changes from appchan. 2014-05-03 01:09:35 -07:00
ccd0
e1ff987c1e enable keybinds on catalog 2014-04-26 22:51:48 -07:00
ccd0
c1ea97cb6f remove old InfiniScroll code 2014-04-26 19:39:17 -07:00
ccd0
cc0cc82c4c fix comment expansion 2014-04-20 01:21:37 -07:00
ccd0
823eace903 begin work on restoring comment expansion 2014-04-19 21:44:13 -07:00
ccd0
bf45917000 Merge branch 'newnames' 
Conflicts:
	src/General/lib/post.class
 2014-04-19 16:57:17 -07:00
ccd0
ec03ab524d Merge branch 'page1' 2014-04-19 15:28:56 -07:00
ccd0
7aeb46abb9 transition to new HTML 2014-04-19 00:28:19 -07:00
ccd0
a452b732fd change res -> thread in JSON API URLs 2014-04-13 01:46:18 -07:00
ccd0
c5b06f6988 Merge branch 'page1' into newnames 2014-04-13 01:38:24 -07:00
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
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
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
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
393eb3ec22 Lets pretend we're smarter than we really are! 2014-03-30 16:53:08 -07:00
Zixaphir
148edd3e33 Restore Scroll To Post Quoting You functionality. 2014-03-24 13:29:09 -07:00
Zixaphir
ca9abdc4e7 Remove Main.callbacknodes 2014-03-14 16:02:19 -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
Mayhem
06da6b0c9e Nuke Announcement Hiding setting. 2014-03-10 09:17:33 +01: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
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
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
Zixaphir
6dd0cac797 Merge branch 'master' of https://github.com/Spittie/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/Monitoring/Favicon.coffee
 2014-02-16 01:00:41 -07:00
ahodesuka
c97112d0ee Change ordering to be the same as the dropdown. 2014-02-12 02:21:08 -06:00
ahodesuka
1c47e1c197 Remove unneeded parentheses, change default keybindings, remove unneeded slice and filter. 2014-02-12 02:09:02 -06:00
ahodesuka
165fad8623 Add hotkeys for index modes. 2014-02-12 00:11:29 -06:00
Mayhem
ab739fd446 Add keybind to cycle through index sort types. 2014-02-11 10:13:53 +01:00
Kabir Sala
601312d9f6 Add OpenSUSE emoji 2014-02-10 15:44:48 +01:00
Mayhem
a234bdb2a5 Merge pull request #1412 from MayhemYDG/catalog 
Drop support for the inline catalog
 2014-02-05 18:03:40 +01:00