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

180 Commits

Author SHA1 Message Date
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
8fa130c2df Backport @vampiricwulf's flash features 2014-02-23 08:32:06 -07:00
Mayhem
ce2b9ee170 Add post labelling. 2014-02-22 00:17:47 +01: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
a234bdb2a5 Merge pull request #1412 from MayhemYDG/catalog 
Drop support for the inline catalog
 2014-02-05 18:03:40 +01:00
Mayhem
0675146d22 Add pin/hide/show thread menu entries for the catalog. 2014-02-04 13:51:21 +01:00
Mayhem
81b2c8eef2 Add catalog switcher button in the inline catalog. 2014-01-29 17:51:19 +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
59fa428db5 Warn about Firefox versions <26. 2014-01-21 13:58:50 +01:00
Mayhem
fdd6a20c87 rm useless code 2014-01-20 09:51:52 +01:00
Mayhem
bf51864823 Typo. 2014-01-19 13:00:56 +01:00
Mayhem
c47c3ddafe Move previous version check out of Setting and into Main. 
Also halve the notice timeout.
 2014-01-19 01:05:48 +01:00
Zixaphir
dc5daeba06 I really don't like iterating through objects. 2014-01-14 20:17:44 -07:00
Zixaphir
481ca6af72 Fix and use thread.collect for GC 
Also merge appchan's JSON option fixes
 2014-01-14 17:18:30 -07:00
Zixaphir
a02705f520 Errors are handled differently now 2014-01-11 15:09:00 -07:00
Zixaphir
c7f0646c42 Better 2014-01-11 15:06:55 -07:00
Zixaphir
efc2fd5bd2 Safer 2014-01-11 15:05:37 -07:00
Zixaphir
bf80874f9f Less checks and less misses? Performance and stability? Oh my. 2014-01-11 14:39:14 -07:00
Zixaphir
ebf6808297 Improve responsiveness of style switcher 2014-01-10 17:52:09 -07:00
Zixaphir
0d29b42a02 This kills the script 
No, seriously, this commit breaks everything if you open a reply.
It's k, though, that's why this branch exists: so I can break it
all without harming end users and stable development.

Holy carp, though, the amount of errors thrown!
 2014-01-09 18:51:49 -07:00
Zixaphir
84cbff8a77 ThreadStats.disconnect() 2014-01-09 15:37:01 -07:00
Zixaphir
ab8607710b Switch document class names when switching between views 2014-01-09 14:49:05 -07:00
Zixaphir
259529b6dd The more you know, am I right? 2014-01-09 14:26:09 -07:00
Zixaphir
4e56d17d54 Best. 2014-01-09 14:24:19 -07:00
Zixaphir
aaf1ee06ee "f" 2014-01-09 14:18:23 -07:00
Zixaphir
22c244ce69 Finally fix Index from Thread navigation 2014-01-09 14:09:19 -07:00
Zixaphir
3327c9cf36 Rearrange some stuff, fix ThreadUpdater.disconnect 2014-01-09 12:55:06 -07:00
Zixaphir
18d3d6b6e9 Merge branch 'v3' into json 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/Index.coffee
	src/General/Main.coffee
 2014-01-09 12:32:59 -07:00
Zixaphir
8f5b04a55f Be more aggressive. 2014-01-09 11:21:21 -07:00
Zixaphir
86c2b07626 Less recursion because recursion is slow. 2014-01-09 11:19:04 -07:00
Zixaphir
d2311ab805 Break up some stuff, address a few small issues 2014-01-09 11:00:08 -07:00
Jordan
0eae013b0b Not sure why this got removed, but re-adding fixes the thread watcher 2014-01-09 01:18:05 -07:00
Jordan
8419b7c88b Merge Zixaphir X, close #221 2014-01-08 20:55:13 -07:00
Zixaphir
1e7fc8ea65 Reflows. 2014-01-08 15:40:57 -07:00
Zixaphir
1c504e0676 Small reflow 2014-01-08 12:45:16 -07:00
Zixaphir
57742dd397 Make the back and forward buttons kinda-sorta work 2014-01-08 12:15:41 -07:00
Zixaphir
5785f9cda3 ;__; 2014-01-08 11:57:54 -07:00
Zixaphir
fca2645787 Improve navigation between boards 
Also allow navigation to indexes from boards.
 2014-01-08 11:40:58 -07:00
Zixaphir
41e3fa05ad Start working on getting index navigation from a thread working 2014-01-08 09:30:23 -07:00
Zixaphir
ebd765cc24 I don't know why that was under the thread conditional? 2014-01-07 22:08:17 -07:00
Zixaphir
ec35cb6742 Try to consolidate 2014-01-07 22:05:41 -07:00
Zixaphir
a02afb8c38 Do you ever feel maybe you're actually dumb? 2014-01-07 21:56:26 -07:00
Zixaphir
bb3d9c9d84 Apparently Main.clean() can break things pretty hard. 
But only if on the same board? Weird.
 2014-01-07 21:12:17 -07:00
Zixaphir
497c231003 Merge branch 'v3' into json 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-01-07 20:29:32 -07:00
Zixaphir
63b09cb803 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	package.json
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/css/font-awesome.css
	src/General/lib/databoard.class
	src/Miscellaneous/ExpandThread.coffee
	src/Monitoring/ThreadUpdater.coffee
 2014-01-07 20:28:47 -07:00
Zixaphir
21056d72f9 Well, fuck. Looks like we're generating board indexes now. :D 2014-01-07 20:15:49 -07:00
Zixaphir
798ab20f35 ThreadUpdater.disconnect() 2014-01-07 16:30:18 -07:00