94 Commits

Author SHA1 Message Date
Zixaphir
af9e544141 Corrections 2014-03-27 13:53:21 -07:00
Zixaphir
e3757d70af Update archives 2014-03-03 00:10:18 -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
Kabir Sala
387ebcad4f Update archives 2014-03-01 04:40:45 +01: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
Kabir Sala
becebab667 Update archives 2014-02-28 20:10:52 +01:00
Kabir Sala
2d47870f51 Fix #12 2014-02-24 17:28:47 +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
Kabir Sala
ced84988e1 Fix my shit 2014-02-21 00:00:24 +01:00
Kabir Sala
3986298f4f Copy fix from Mayhem, hopefully I didn't break anything 2014-02-20 20:56:49 +01:00
Kabir Sala
fb7328ce82 Update builds 2014-02-18 16:10:42 +01:00
Kabir Sala
8a36b0bdbe Update archives 2014-02-17 18:55:31 +01:00
Kabir Sala
516fdb902b Update archives 2014-02-17 18:54:52 +01:00
Spittie
39b8dafc54 Add /biz/ 2014-02-15 17:25:01 +01:00
Kabir Sala
36ed2aaeed Update archives 2014-02-10 16:59:19 +01:00
Kabir Sala
76b2ecc0c5 Add fgts.eu, mawa.re 2014-02-10 01:17:30 +01:00
Kabir Sala
1b6052304b Stuff 2014-02-09 21:43:31 +01:00
milky
4eb0574505 Further archive link work. 2014-02-06 05:47:19 +11:00
milky
3284de0d06 Archive link. 2014-02-06 05:02:36 +11:00
Mayhem
710655f13e Use xhr.responseType = 'json'. 2014-01-21 14:46:26 +01:00
Mayhem
a44164c58d Fix crash 2014-01-20 10:02:19 +01:00
Mayhem
5a10d5f75c Re-select archives when the archives list gets updated
or when we select an archive in the settings.
2014-01-20 09:04:32 +01:00
Mayhem
da203ae76a Update the archives settings tab when manually updating the archives list. 2014-01-19 00:26:00 +01:00
seaweedchan
9a5ddc35d2 Merge zixaphirs typo fix
Close #237
2014-01-12 00:57:36 -07:00
Zixaphir
de5d903e46 That was just a little too much going on in one line 2014-01-09 12:03:23 -07:00
Zixaphir
a7a7df6b7b Hell, lets be a little funny, too. 2014-01-09 11:57:45 -07:00
Zixaphir
da8bcab4f6 Unbreak post resurrection. Whoopse 2014-01-09 11:54:51 -07:00
Zixaphir
a720406bad Be a little more conservative here. 2014-01-07 08:11:28 -07:00
Zixaphir
ddabad15e9 Small optimization to Redirect code 2014-01-07 08:03:23 -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
Zixaphir
cc5cf4f124 Update archives 2013-12-16 13:41:12 -07:00
Zixaphir
711e22f831 Be a bit closer to Mayhem's structure for the archives 2013-10-19 22:54:40 -07:00
Zixaphir
0415de74c1 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/html/Build/post.html
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
2013-10-13 14:29:52 -07:00
Zixaphir
5b87c17e69 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Archive/Redirect.coffee
2013-09-24 14:33:21 -07:00
seaweedchan
6d4da42eb2 Merge Mayhem X 2013-09-22 03:57:03 -07:00
Mayhem
5b44045d55 Remove foolz+hsts issue workaround. 2013-09-21 13:40:52 +02:00
seaweedchan
b9b4efae5e Merge in new thread watcher and change a few things 2013-08-13 00:03:29 -07:00
Zixaphir
19e1af9b46 update foolzashit 2013-08-12 17:13:38 -07:00
Mayhem
30d0cc8718 Typo. 2013-08-12 19:27:46 +02:00
Mayhem
88b6f97fce Drop archives.json update period from 4 to 2 days. 2013-08-12 17:30:00 +02:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
Zixaphir
8b992d42ed Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/lib/$.coffee
	src/Miscellaneous/Time.coffee
2013-08-09 19:36:40 -07:00
Mayhem
0b55e34361 Allow fetching posts for archives that require credentials. 2013-08-09 12:41:59 +02:00
Zixaphir
2fa674c782 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.coffee
	json/archives.json
	src/Archive/Redirect.coffee
	src/General/lib/$.coffee
	src/Monitoring/Unread.coffee
2013-08-04 19:44:42 -07:00
Zixaphir
a54bc6a076 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
2013-08-04 19:02:55 -07:00
Jordan Bates
d0bbe13172 Release 4chan X v1.2.25. 2013-08-04 14:32:25 -07:00
Mayhem
03a8435a94 Fix duplicate data property in object literal not allowed in strict mode. 2013-08-01 22:10:51 +02:00
Zixaphir
392d6e255e Reduce loops in Redirect.init 2013-07-29 11:36:07 -07:00
Zixaphir
44a2b378ca 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/Posting/QuickReply.coffee
2013-07-24 21:49:24 -07:00