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

114 Commits

Author SHA1 Message Date
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
a3437ff0ae Merge branch 'v3' 2014-03-11 16:01:24 -07:00
Zixaphir
6bb31cc845 Filtered posts are now added to the PostHiding DataBoard 
Fixes #632
 2014-03-11 15:59:47 -07:00
Zixaphir
c066fe94b4 Fix PostHiding.showButton 2014-03-11 11:32:16 -07:00
Mayhem
2ae6ae1dfd Fix #1499. 2014-03-10 09:44:49 +01:00
Zixaphir
3eb1ae0110 Fix post hiding buttons 2014-03-09 15:28:22 -07:00
Zixaphir
c7b044cc8e Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-09 15:09:44 -07:00
Zixaphir
865c5331ba Fix Recursive hiding 2014-03-09 15:03:21 -07:00
Zixaphir
7301f43289 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/css/yotsuba-b.css
	src/Images/FappeTyme.coffee
 2014-03-06 23:07:49 -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
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
6ba92efcd4 Start working on fixing things after the last merge 2014-02-28 14:48:24 -07:00
Mayhem
a853bd5e8e Make hiding threads on all threads index mode faster. #1484 2014-02-27 17:54:31 +01:00
Mayhem
c3fd98551a Less <i>s. 2014-02-24 20:33:58 +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
0ea3c733a4 Hide threads like we hide them in the catalog. 2014-02-22 00:17:48 +01:00
Mayhem
0d7190b4d6 regexp -> string 2014-02-22 00:17:47 +01: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
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
b9e8ff0b19 Make the hidden label an integral part of the index. 2014-02-01 20:42:59 +01:00
Mayhem
aeb1147bb3 Refactor hidden threads count. 
It concerns filtered threads too, not just manually hidden threads.
 2014-02-01 20:21:15 +01:00
Mayhem
0092c53783 Add hidden threads count on the index. 2014-02-01 19:48:37 +01:00
Mayhem
f080a15292 Merge branch 'v3' into catalog 2014-02-01 00:32:17 +01:00
Mayhem
aaf5e8bb1a Fix ThreadHiding.onIndexRefresh(). 2014-01-31 19:03:19 +01:00
Mayhem
1aa467b051 Remove all inline catalog-related code. 2014-01-29 16:25:52 +01:00
Mayhem
9f682bea14 Alt+click to pin threads in the catalog. 2014-01-28 10:26:46 +01:00
Mayhem
1d43fbc498 Shift+click to hide threads in the catalog. 2014-01-28 09:59:49 +01:00
Mayhem
509156a956 Don't use the IndexBuild event for hiding threads. 2014-01-26 20:29:21 +01: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
Mayhem
7623040593 Add filter-highlight to threads on the catalog. 2014-01-26 18:19:23 +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
710655f13e Use xhr.responseType = 'json'. 2014-01-21 14:46:26 +01:00
Zixaphir
2184727cd7 Holy consistent implementations, Batman! 
It would appear by making code blocks that are reusable that we can
reuse them!
 2014-01-19 05:29:46 -07:00
Zixaphir
bec7045024 Fix #543 2014-01-19 05:21:06 -07:00
Zixaphir
cc7decfd34 Merge branch 'v3' 2014-01-17 13:23:36 -07:00
Zixaphir
dc5daeba06 I really don't like iterating through objects. 2014-01-14 20:17:44 -07:00
Zixaphir
bd08bd964d Merge branch 'json' into ajson 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/css/font-awesome.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Features/Index-navlinks.html
	src/General/html/Monitoring/ThreadWatcher.html
	src/Images/Gallery.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QR.coffee
 2014-01-11 15:55:46 -07:00
Jordan
526783d273 Font-awesome hide buttons, close #226 2014-01-09 03:05:46 -07:00
Zixaphir
dcd6547169 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/General/Header.coffee
 2013-12-27 15:35:34 -07:00
Zixaphir
9262e8a7af Messing around with some syntax 2013-12-26 15:50:02 -07:00
Zixaphir
996080cab9 Merge branch 'v3' 
Conflicts:
	Gruntfile.coffee
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Menu/Menu.coffee
	src/Posting/QR.coffee
 2013-12-25 11:23:41 -07:00
Zixaphir
b38f63e313 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	Gruntfile.coffee
	src/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/lib/$.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
 2013-12-25 10:54:21 -07:00
Zixaphir
6dd2e60e9a Element.contains was not Array.contains, lol 2013-12-25 10:10:51 -07:00
Zixaphir
af666d38cd Merge branch 'v3' 
Conflicts:
	src/Posting/QuickReply.coffee
 2013-12-24 16:32:48 -07:00
Zixaphir
8bad58920a Fix not var in obj, var not in obj 2013-12-24 16:31:09 -07:00
Zixaphir
ae789f4ad8 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Index.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/Posting/QuickReply.coffee
 2013-12-24 16:18:47 -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