202 Commits

Author SHA1 Message Date
ccd0
43a99b9291 update catalog.neet.tv board list 2014-05-12 23:56:53 -07:00
Zixaphir
02ed8d2db0 4gropes has been broken for awhile, I guess? Fix #687
If anyone has a new catalog to replace 4gropes, CC me.
2014-05-12 23:46:58 -07:00
ccd0
97ca89c83d Escape file info more aggressively.
Most of this isn't strictly necessary, but it makes the script
more robust against changes, either in 4chan or the script itself.
I don't want to have to review this code for vulnerabilities each
time something changes.
2014-05-12 22:20:04 -07:00
ccd0
57ed5e8055 fix privilege escalation vulnerability 2014-05-12 21:46:18 -07:00
ccd0
c3f04314cc make things work with Quick Reply and Thread Updater disabled 2014-05-11 17:36:13 -07:00
ccd0
e1ff987c1e enable keybinds on catalog 2014-04-26 22:51:48 -07:00
ccd0
c1ea97cb6f remove old InfiniScroll code 2014-04-26 19:39:17 -07:00
ccd0
cc0cc82c4c fix comment expansion 2014-04-20 01:21:37 -07:00
ccd0
823eace903 begin work on restoring comment expansion 2014-04-19 21:44:13 -07:00
ccd0
bf45917000 Merge branch 'newnames'
Conflicts:
	src/General/lib/post.class
2014-04-19 16:57:17 -07:00
ccd0
ec03ab524d Merge branch 'page1' 2014-04-19 15:28:56 -07:00
ccd0
7aeb46abb9 transition to new HTML 2014-04-19 00:28:19 -07:00
ccd0
a452b732fd change res -> thread in JSON API URLs 2014-04-13 01:46:18 -07:00
ccd0
c5b06f6988 Merge branch 'page1' into newnames 2014-04-13 01:38:24 -07:00
ccd0
9fe486d637 Merge branch 'master' into page1 2014-04-13 01:19:02 -07:00
ccd0
814b64b31c update URLs to 4cdn.org 2014-04-12 22:37:27 -07:00
ccd0
4ecd6f8cfe res -> thread 2014-04-12 21:16:01 -07:00
ccd0
1182047357 more indexing changes 2014-04-12 18:41:05 -07:00
ccd0
1ee5c11968 restore non-JSON navigation keybinds 2014-04-12 04:03:27 -07:00
ccd0
aedaac2b24 get thread expansion working 2014-04-07 03:32:47 -07:00
Zixaphir
337b43591b Fix webm PDF bug
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
2014-04-04 16:07:08 -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
Kabir Sala
601312d9f6 Add OpenSUSE emoji 2014-02-10 15:44:48 +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
508ab4f884 Make $.addClass/rmClass use multiple classes at once. 2014-01-21 15:30:47 +01:00
Mayhem
7495a905dd Fix thread expanding.
Apparently an xhr's reponse is read-only.
2014-01-21 15:17:00 +01: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
Zixaphir
1b368e4edc Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/General/Index.coffee
2014-01-12 14:52:47 -07:00
seaweedchan
e5fd95158b Start work on infinite scrolling 2014-01-12 01:15:31 -07:00
Zixaphir
a20e85d30f Features can *and should* handle under what context they disconnect 2014-01-11 12:03:50 -07:00
Zixaphir
a44e75862f Merge branch 'v3' into json
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
2014-01-10 17:18:23 -07:00
Jordan
64b13ef184 Board title and announcement tweaks
Close #232, close #233
2014-01-10 08:34:56 -07:00
Jordan
52a287f11f Announcement hiding button in font awesome
Close #231
2014-01-10 07:44:54 -07:00
Zixaphir
79cf8713a4 Add some stuff, hopefully should reduce errors 2014-01-09 23:10:32 -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
3b1340433e Faster Catalog Links code
Ours is based on @ihavenoface's old catalog code, not @MayhemYDG's,
so we don't particularly benefit from advancements in his code, per
se, without rechecking and validating the quality of our own. This
happens to be a case where we were stuck in an inefficient paradigm
and never revisited.

We now appear much closer to Mayhem's code, but are still mostly
absent from being merged into the rest of the Header code. Whether
we decide to merge or not should probably be discussed at some
point.
2013-12-18 16:55:27 -07:00
Zixaphir
5d6b357135 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/lib/post.class
2013-12-18 12:21:43 -07:00
Zixaphir
545a1f346f "Fix" Fappe/Werk Tyme and actually fix Werk Tyme. 2013-12-16 13:36:19 -07:00
Zixaphir
a719bbde38 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Config.coffee
2013-12-16 12:56:09 -07:00
Mayhem
ceff7c5d5f Add Refreshed Navigation setting.
Close #1323, #1332.
2013-12-12 02:03:18 +01:00
Zixaphir
bdba59eccc Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.coffee
	package.json
	src/Miscellaneous/Keybinds.coffee
2013-12-09 19:00:56 -07:00
Mayhem
26f0fca675 Fix #1376. 2013-12-09 11:18:24 +01:00
Mayhem
e22aa713b3 axe -> axis 2013-12-07 13:58:44 +01:00
Mayhem
6441852793 Fix #1372. 2013-12-07 13:39:55 +01:00
Mayhem
1609e4996b Fix #1371.
Xpaths are fabulous.
2013-12-07 13:36:48 +01:00
Jordan Bates
16fc57ca2d Merge mayhems fix for #214 2013-12-06 17:02:56 -07: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