6316 Commits

Author SHA1 Message Date
Zixaphir
aa48ee519c Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
2014-01-12 14:56:32 -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
Zixaphir
41e6feacbb Add a pseudo element class for font awesome, use it for submenus 2014-01-12 14:13:56 -07:00
Zixaphir
0f1ab5c5a5 Finally make the Captcha Filter into an option
I'm fairly certain I've "fixed" the invisible captcha issue, but
for whatever reason, someone might just not want a filter.
2014-01-12 13:56:11 -07:00
Zixaphir
69f3ef7aa9 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-01-12 13:44:05 -07:00
Zixaphir
860ca555b7 This line was in error.
QR Personas are *always* enabled.
2014-01-12 13:43:10 -07:00
Jordan
1c253782e8 Release 4chan X v1.3.1. 2014-01-12 09:51:00 -07:00
Jordan
a1cc8dab01 Infinite scrolling index mode
Close #236
2014-01-12 09:46:36 -07:00
seaweedchan
e5fd95158b Start work on infinite scrolling 2014-01-12 01:15:31 -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
Jordan
a1e3793cb5 Make a few changes specific to the fixed header
Close #239
2014-01-11 22:18:03 -07:00
Zixaphir
c13cbfce18 Release appchan x v2.8.0. 2014-01-11 21:33:45 -07:00
Zixaphir
2061eb1a75 Fix Mascot dialog 2014-01-11 21:15:58 -07:00
Zixaphir
9a5a4cc03c Merge branch 'v3' 2014-01-11 21:03:55 -07:00
Zixaphir
43bcc64681 Let Index.update handle its own page functions 2014-01-11 21:02:56 -07:00
Zixaphir
79776710af return 2014-01-11 20:22:45 -07:00
Zixaphir
ab3a4c6640 Get hash navigation working with Navigate.navigate() 2014-01-11 20:21:25 -07:00
Zixaphir
2e242a9f9d Holy, how tired was I when I did that? Damn. 2014-01-11 19:52:49 -07:00
Zixaphir
4710baf08c Merge branch 'v3' into ajson
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
2014-01-11 19:35:00 -07:00
Zixaphir
495567682b Fix duplicate backlinks 2014-01-11 19:34:07 -07:00
Zixaphir
cb39424dea Reduce number of loops in Redirect 2014-01-11 17:19:19 -07:00
Zixaphir
75c76d5ed0 Don't know how I missed that while merging... 2014-01-11 16:57:17 -07:00
Zixaphir
f167a2f657 Merge branch 'json' into ajson 2014-01-11 16:14:29 -07:00
Zixaphir
2b1a49b02e That didn't work as expected. 2014-01-11 16:14:16 -07:00
Zixaphir
bd08bd964d Merge branch 'json' into ajson
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/css/font-awesome.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Features/Index-navlinks.html
	src/General/html/Monitoring/ThreadWatcher.html
	src/Images/Gallery.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QR.coffee
2014-01-11 15:55:46 -07:00
Zixaphir
a02705f520 Errors are handled differently now 2014-01-11 15:09:00 -07:00
Zixaphir
c7f0646c42 Better 2014-01-11 15:06:55 -07:00
Zixaphir
efc2fd5bd2 Safer 2014-01-11 15:05:37 -07:00
Zixaphir
dcb734afff Small fix to backlinks code 2014-01-11 14:54:41 -07:00
Zixaphir
bf80874f9f Less checks and less misses? Performance and stability? Oh my. 2014-01-11 14:39:14 -07:00
Zixaphir
6bafef092b Restore the hr at the bottom of threads 2014-01-11 12:51:14 -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
a20e85d30f Features can *and should* handle under what context they disconnect 2014-01-11 12:03:50 -07:00
Zixaphir
1e24021c07 I think this was what I had meant to put there.
It checks unread count already anyways, and the previous behavior
was causing QuoteThreading.force() to run twice, and may have
caused an issue where backlinks were doubling-up? I don't know, I'm
still looking into that issue because it's happening on the Index
as well.
2014-01-11 11:37:11 -07:00
Zixaphir
1277d32161 The previous behavior was causing multiple notifications
on if you switched between boards too quickly
2014-01-11 11:33:51 -07:00
Zixaphir
4ae16f4131 Set a close timeout on the Index.notify 2014-01-11 11:31:15 -07:00
Zixaphir
c2ac7e66b1 Handle popstate on Chrome a bit better 2014-01-11 11:28:33 -07:00
Zixaphir
805c40d3bf Fix .current switcher
Single letter boards were matching, well... anything with their
board letter. I guess I wrote that pretty dumb, hah.
2014-01-11 11:14:35 -07:00
Zixaphir
1e7c617d80 Would be nice if I checked my case before committing, no? 2014-01-11 11:07:34 -07:00
Zixaphir
5222edafd4 Add a check for SFW status before we go stampeding all over it.
Lets not do more than we have to do, m'kay?
2014-01-11 11:04:14 -07:00
Zixaphir
d8bc0616e8 Strings y'all 2014-01-11 11:00:04 -07:00
Zixaphir
93c78e2d54 I like that just a little bit better. 2014-01-11 10:56:48 -07:00
Zixaphir
989f1b3c7b Further reduce redundancy in style switching.
Ok, I'm done with that now.
2014-01-11 10:50:49 -07:00
Zixaphir
9d6e29616d Get favicon switching working, reduce redundancy 2014-01-11 10:44:33 -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
3a76018fe4 Add return buttons and the like to the Index.navLinks
We need to generate these now because the Index features always
will remove them.
2014-01-11 00:04:44 -07:00
Zixaphir
1900bbfa27 Fix Unread Count with JSON features 2014-01-10 23:41:09 -07:00