2633 Commits

Author SHA1 Message Date
Zixaphir
a4ead91d65 Remove some accidental cruft left from incorrectly merging
Fix some QR bugs, remove references to the 'catalog' g.VIEW
And actually put in QuoteMarkers
2014-03-02 18:59:35 -07:00
Zixaphir
19800bd0d9 Hide Index UI in thread view. 2014-03-01 15:07:26 -07:00
Zixaphir
5a1bebf14d Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Posting/QR.coffee
2014-03-01 14:53:36 -07:00
Zixaphir
a0c24fd06d Fix some stupid threadupdater issues, more navigate from catalog js 2014-03-01 14:46:37 -07:00
Kabir Sala
2309634930 Forget image 2014-03-01 18:59:46 +01: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
553a5a9133 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/General/Index.coffee
	src/Posting/QR.coffee
2014-02-28 19:37:26 -07:00
Zixaphir
0d7f5ab78c Lets use our "dialog" class for shit we don't need to fuck around with 2014-02-28 19:22:38 -07:00
Zixaphir
6c4e97b388 Restore CSS I accidentally deleted
This is Seaweed's stuff, and he kinda-sorta originally wrote the
stylesheets for a lot of these styles for 4chan (not 4chan X)
so it's probably best we leave them to his vision.
2014-02-28 19:12:13 -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
Zixaphir
5a76a9109c Cache boards.json 2014-02-28 18:29:52 -07:00
Zixaphir
b4d28414df Fix OPs being built twice 2014-02-28 16:27:54 -07:00
Zixaphir
6ba92efcd4 Start working on fixing things after the last merge 2014-02-28 14:48:24 -07:00
Mayhem
59f2ca6a51 rm as many id attributes in posts as possible.
Add root.dataset.fullID, simplify Get.postFromRoot().
Also figured Menu.toggle() could be simplified since stub of threads do not exist anymore.
2014-02-27 19:02:32 +01:00
Mayhem
2924711db4 Get rid of Index.nodes, -1 Get.threadFromRoot call. 2014-02-27 17:42:52 +01:00
Kabir Sala
66e1e23e6a Partially fix #19 2014-02-27 16:37:18 +01:00
Kabir Sala
9a4199d829 Fix #14 2014-02-25 13:20:19 +01:00
Mayhem
ac8e05dd22 Simplify import/export of settings.
Also clear all stored data before importing.
2014-02-24 23:56:30 +01:00
Mayhem
397e936765 Wait for the pagelist to be replaced before removing .index-loading. 2014-02-24 15:27:00 +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
8fa130c2df Backport @vampiricwulf's flash features 2014-02-23 08:32:06 -07:00
Zixaphir
3a8ccfc237 Move Flash features into their own function
Also standardize code
2014-02-23 08:23:11 -07:00
Zixaphir
56ed876be8 Merge branch 'master' of git://github.com/vampiricwulf/appchan-x
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-02-23 08:05:27 -07:00
Mayhem
3f2aeff448 Fix #1473. 2014-02-23 02:08:51 +01:00
Mayhem
49c9156c30 Optimize the index by using a sorted list of threads instead of nodes.
Only one call to Get.threadFromRoot() per thread now.
2014-02-22 00:17:49 +01:00
Mayhem
27fa3f2bf7 Switching between the un/hidden thread index should navigate us to page 0. 2014-02-22 00:17:48 +01:00
Mayhem
8613e11bc2 Hiding threads will hide empty index pages too.
Rebuilding the paged index should navigate us to the last available page.
2014-02-22 00:17:48 +01:00
Mayhem
ab2ea29dd6 Hiding threads should be able to hide other posts recursively too. 2014-02-22 00:17:48 +01:00
Mayhem
498dfda2ef Update code related to hidden threads. 2014-02-22 00:17:48 +01:00
Mayhem
0ea3c733a4 Hide threads like we hide them in the catalog. 2014-02-22 00:17:48 +01:00
Mayhem
0e3f90fe4f Make use of Post::getNameBlock(). 2014-02-22 00:17:48 +01:00
Mayhem
463947820f Simpler code for stubs. 2014-02-22 00:17:48 +01:00
Mayhem
785f5b39dc Make Thread::{hide,show} handle the catalog view. 2014-02-22 00:17:48 +01:00
Mayhem
ce2b9ee170 Add post labelling. 2014-02-22 00:17:47 +01:00
Mayhem
d052bfc186 Optimize the index by dealing with HRs as little as possible. 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
5ca21b1f4a Refresh the index when trying to navigate to the same board.
Close #1461.
2014-02-21 17:07:00 +01:00
Zixaphir
31a444e319 Quick CSS fixes 2014-02-20 12:55:26 -07:00
Zixaphir
f1cf2a7828 Get rid of excess space in vertical icons orientation 2014-02-18 10:03:33 -07:00
Mayhem
b9896b48d2 Add some default booleans to Posts and Threads.
Remove timeOfDeath as I won't get to use it anytime soon.
Fix #1456.
2014-02-17 18:07:51 +01:00
Brandon
e4a781cea6 basic /f/ fixup css 2014-02-16 12:33:39 -08:00
Zixaphir
4e4bff6a54 Oops 2014-02-16 05:58:23 -07:00
Zixaphir
3c102d4823 Fix #568 2014-02-16 05:22:35 -07:00
Zixaphir
57dab55dcb Add an option to hide navLink UI. #572 2014-02-16 04:37:12 -07:00
Zixaphir
7f69ba59fb resolve #472 2 2014-02-16 04:25:29 -07:00
Zixaphir
9dc9d96574 Unread part of #579 2014-02-16 04:16:33 -07:00
Zixaphir
cab9cef36e Remove last ad plea 2014-02-16 04:10:30 -07:00
Zixaphir
51219252aa Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
2014-02-16 04:02:31 -07:00
Zixaphir
b3f937f5c8 Fix JSON Navigation unread count 2014-02-16 03:11:27 -07:00
Zixaphir
ff1467b7e5 Fix #581, Fix #580 2014-02-16 02:32:33 -07:00