84 Commits

Author SHA1 Message Date
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
Mayhem
10ee666e7d rm tmp conversion of hiddenThreads. 2014-04-12 02:03:01 +02: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
Mayhem
0bc93400c1 .webm #1533 2014-04-05 00:32:44 +02: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
6bb31cc845 Filtered posts are now added to the PostHiding DataBoard
Fixes #632
2014-03-11 15:59:47 -07:00
Mayhem
2ae6ae1dfd Fix #1499. 2014-03-10 09:44:49 +01:00
Zixaphir
865c5331ba Fix Recursive hiding 2014-03-09 15:03:21 -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
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
dc5daeba06 I really don't like iterating through objects. 2014-01-14 20:17:44 -07:00
Jordan
526783d273 Font-awesome hide buttons, close #226 2014-01-09 03:05:46 -07:00
Zixaphir
9262e8a7af Messing around with some syntax 2013-12-26 15:50:02 -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
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
Mayhem
be8371d4c6 Optimize Menu.makeButton(). 2013-12-20 04:14:53 +01:00
Mayhem
4e0e881172 Slightly faster PostHiding.makeButton(). 2013-12-15 02:50:52 +01: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
f09121ab2e More index tweaking/optimization and small thread hiding fix.
Most feature that need to be called on each index refresh don't need
to be called on every single page build, but only after building the
threads. ThreadHiding needs to be fired on each page build to ensure
that the stub summaries fit with the number of replies, so it has to
wait for the last replies to be added. This also fixes the bug where
ThreadHiding was creating one extra stub on each IndexRefresh event.
2013-11-05 01:21:26 +01:00
Mayhem
8f56d3e415 Remove some now useless code in ExpandThread and small cleanup in ThreadHiding. 2013-11-04 21:32:58 +01:00
Mayhem
66189e449c Update the number of replies in thread stubs after an index refresh. 2013-11-04 11:22:49 +01:00
Mayhem
301d5d8a7a Typo. 2013-11-03 23:58:06 +01:00
Mayhem
94322e3dd8 Index optimization: only build/load last replies of visible threads. 2013-11-03 18:55:58 +01:00
Mayhem
bc0f5fcc3b Avoid creating new thread root+<hr> when they already exist. 2013-11-03 17:14:01 +01:00
Mayhem
66ebbd87f0 Fix thread hiding after an index refresh. 2013-11-02 19:21:04 +01:00
Mayhem
f0d19e6a5c Fix threads highlighted by the filter not being put on top. 2013-11-02 19:21:03 +01:00