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

89 Commits

Author SHA1 Message Date
Zixaphir
6536d5a2b3 Yeah, let's start the day with obviously erroneous code! 2014-02-16 01:07:32 -07:00
Zixaphir
6dd0cac797 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/Archive/Redirect.coffee
	src/General/Header.coffee
	src/Monitoring/Favicon.coffee
 2014-02-16 01:00:41 -07: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
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
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
thebladeee
22ab0a4a12 Update Nyafuu & Add Love is Over 2014-01-17 12:55:46 -07:00
seaweedchan
9a5ddc35d2 Merge zixaphirs typo fix 
Close #237
 2014-01-12 00:57:36 -07:00
Zixaphir
6ed2f67fe2 Holy shit fuck me with a chainsaw I'm so retarded I deserve it 
(but really plz don't, I'm just tired and this is a tired-zix commit)
Halp
 2014-01-12 00:00:33 -07:00
Zixaphir
cb39424dea Reduce number of loops in Redirect 2014-01-11 17:19:19 -07:00
Zixaphir
b3c33bb39b Merge branch 'v3' into json 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
 2014-01-11 12:09:33 -07:00
Zixaphir
de16671c49 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	LICENSE
	json/archives.json
 2014-01-11 12:07:46 -07:00
Zixaphir
8c7677e405 I need to stop making such stupid typos 2014-01-11 00:28:54 -07:00
Zixaphir
5e73209e35 Avoid both for key in object and a lot of indexOf looping 2014-01-11 00:18:02 -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
seaweedchan
979694a973 Release 4chan X v1.2.24. 2013-07-24 02:12:15 -07:00
seaweedchan
c34f6693cb Release 4chan X v1.2.22. 2013-07-23 01:54:28 -07:00
Zixaphir
d2bcf840ff 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
	src/Archive/Redirect.coffee
 2013-07-21 08:43:58 -07:00
Zixaphir
582d067a10 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.js
	README.md
	changelog-old
	css/style.css
	html/Monitoring/ThreadStats.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Filter-guide.html
	src/General/lib/$.coffee
	src/General/lib/clone.class
	src/General/lib/post.class
	src/Images/ImageHover.coffee
	src/Menu/Menu.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/Quotify.coffee
 2013-07-21 08:39:40 -07:00
Jordan Bates
9ba459ea8a Release 4chan X v1.2.19. 2013-07-14 03:58:01 -07:00