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

199 Commits

Author SHA1 Message Date
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
Mayhem
3d7097fffb Screw supporting 4chan's inline features. 2014-02-05 16:11:04 +01:00
Mayhem
1aa467b051 Remove all inline catalog-related code. 2014-01-29 16:25:52 +01:00
Zixaphir
b6749b91a5 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	css/style.css
	html/General/Settings-section-Main.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/thread.class
	src/Linkification/Linkify.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadStats.coffee
 2014-01-22 12:10:34 -07:00
Mayhem
508ab4f884 Make $.addClass/rmClass use multiple classes at once. 2014-01-21 15:30:47 +01:00
Mayhem
7495a905dd Fix thread expanding. 
Apparently an xhr's reponse is read-only.
 2014-01-21 15:17:00 +01:00
Mayhem
710655f13e Use xhr.responseType = 'json'. 2014-01-21 14:46:26 +01:00
Zixaphir
dc5daeba06 I really don't like iterating through objects. 2014-01-14 20:17:44 -07:00
Zixaphir
1b368e4edc Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/General/Index.coffee
 2014-01-12 14:52:47 -07:00
seaweedchan
e5fd95158b Start work on infinite scrolling 2014-01-12 01:15:31 -07:00
Zixaphir
a20e85d30f Features can *and should* handle under what context they disconnect 2014-01-11 12:03:50 -07:00
Zixaphir
a44e75862f Merge branch 'v3' into json 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-01-10 17:18:23 -07:00
Jordan
64b13ef184 Board title and announcement tweaks 
Close #232, close #233
 2014-01-10 08:34:56 -07:00
Jordan
52a287f11f Announcement hiding button in font awesome 
Close #231
 2014-01-10 07:44:54 -07:00
Zixaphir
79cf8713a4 Add some stuff, hopefully should reduce errors 2014-01-09 23:10:32 -07:00
Zixaphir
8bad58920a Fix not var in obj, var not in obj 2013-12-24 16:31:09 -07:00
Zixaphir
91233b8d61 remove [].contains. It was a bad idea. 
I shouldn't be messing with stuff like this without a really good
reason for doing so, and the longer I thought about it, the more
it occurred to me that I didn't have one.
 2013-12-24 14:41:21 -07:00
Zixaphir
3b1340433e Faster Catalog Links code 
Ours is based on @ihavenoface's old catalog code, not @MayhemYDG's,
so we don't particularly benefit from advancements in his code, per
se, without rechecking and validating the quality of our own. This
happens to be a case where we were stuck in an inefficient paradigm
and never revisited.

We now appear much closer to Mayhem's code, but are still mostly
absent from being merged into the rest of the Header code. Whether
we decide to merge or not should probably be discussed at some
point.
 2013-12-18 16:55:27 -07:00
Zixaphir
5d6b357135 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/lib/post.class
 2013-12-18 12:21:43 -07:00
Zixaphir
545a1f346f "Fix" Fappe/Werk Tyme and actually fix Werk Tyme. 2013-12-16 13:36:19 -07:00
Zixaphir
a719bbde38 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Config.coffee
 2013-12-16 12:56:09 -07:00
Mayhem
ceff7c5d5f Add Refreshed Navigation setting. 
Close #1323, #1332.
 2013-12-12 02:03:18 +01:00
Zixaphir
bdba59eccc Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.coffee
	package.json
	src/Miscellaneous/Keybinds.coffee
 2013-12-09 19:00:56 -07:00
Mayhem
26f0fca675 Fix #1376. 2013-12-09 11:18:24 +01:00
Mayhem
e22aa713b3 axe -> axis 2013-12-07 13:58:44 +01:00
Mayhem
6441852793 Fix #1372. 2013-12-07 13:39:55 +01:00
Mayhem
1609e4996b Fix #1371. 
Xpaths are fabulous.
 2013-12-07 13:36:48 +01:00
Jordan Bates
16fc57ca2d Merge mayhems fix for #214 2013-12-06 17:02:56 -07:00
Zixaphir
a3c1afa5cd Merge -- probably bugged until I sort out everything 
that's actually changed. Honestly, all I wanted was the
4cdn changes, but any excuse to merge was good enough, I guess.

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	changelog-old
	css/style.css
	html/General/Settings.html
	html/Monitoring/ThreadUpdater.html
	html/Monitoring/ThreadWatcher.html
	html/Posting/QR.html
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/post.class
	src/General/meta/manifest.json
	src/Images/ImageExpand.coffee
	src/Meta/banner.js
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Miscellaneous/Nav.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
 2013-11-22 17:25:06 -07:00
Mayhem
985afb2a1a Support 4cdn. 2013-11-21 23:11:02 +01:00
Mayhem
a6d41a0de0 Refactor RelativeDates, and fix the last index refresh timer not being always updated. 2013-11-19 11:55:39 +01:00
Mayhem
8afcac8d6f Add the Show replies index setting. 2013-11-16 15:57:47 +01:00
Mayhem
564e799d31 Indicate the elapsed time since the last index refresh at the top of the index. 2013-11-16 15:57:46 +01:00