4chan-x

History

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

ArchiveLink.coffee

Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)

2014-02-23 14:04:45 -07:00

DeleteLink.coffee

Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)

2014-02-23 14:04:45 -07:00

DownloadLink.coffee

Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet)

2014-02-23 14:04:45 -07:00

Labels.coffee

Hide threads like we hide them in the catalog.