350 Commits

Author SHA1 Message Date
Zixaphir
762e733896 Lazy-merge Mayhem's captcha fixes
now back to skyrim.
2014-02-09 18:13:15 -07:00
Zixaphir
5578c4c0f0 Release appchan x v2.8.8. 2014-01-30 14:21:19 -07:00
Zixaphir
9199f12ce0 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Images/Sauce.coffee
2014-01-28 01:14:01 -07:00
Zixaphir
2ac2286ad5 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	src/General/lib/$.coffee
	src/Images/Sauce.coffee
2014-01-28 01:11:06 -07:00
Zixaphir
1f49ef2212 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/html/Settings/Settings.html
	src/Miscellaneous/AnnouncementHiding.coffee
2014-01-26 11:40:50 -07:00
Zixaphir
b62d82bed0 Mayhem made responseType JSON default for any URL containing .json. 2014-01-24 14:48:39 -07: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
Zixaphir
f301f1c2c2 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-01-21 13:59:05 -07:00
Zixaphir
702a343f5e Fix image expansion
DURR
2014-01-21 13:57:28 -07:00
Zixaphir
a993b440dc Try to get some better errors out of QR.req.onerror
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/layout.css
2014-01-19 16:19:18 -07:00
Zixaphir
8ad63f968a Release appchan x v2.8.7. 2014-01-19 15:29:48 -07:00
Zixaphir
d0ec506633 Release appchan x v2.8.6. 2014-01-19 05:42:34 -07:00
Zixaphir
b82ba8b620 A bit of cleanup of Rice. 2014-01-19 05:14:59 -07:00
Zixaphir
8ddf2b4e5f Start working on tightening our control of the Navigation context
Currently breaks posting.

TODO:
* Fix style switching from NSFW to SFW (SFW to NSFW works)
  - It is worth noting this used to work.
* Fix post form not updating its currently selected thread.
* Fix navigation between threads in different boards (same boards
  works? Maybe?)
* Handle race conditions due to pop states.
  - I'm having a lot of trouble wrapping my mind around this one.
    Mostly due to the fact that I have no idea where to begin with
    it. But this isn't a big issue unless you pop state multiple
    times within seconds.

    I just need some exceptions when we try to disconnect features
    that haven't even finished connecting due to threads not being
    available yet.

Most of the early issues, like double-backlinks, incorrect
thumbnails, etc, have been fixed, I think. Or at least I'm no
longer running into them all the time.
2014-01-18 02:34:18 -07:00
Zixaphir
baa99f286e Bullshit, really 2014-01-18 01:22:58 -07:00
Zixaphir
90f780fff3 build 2014-01-17 13:10:52 -07:00
Zixaphir
8e1469ed55 Fix some hover issues caused by me being a n00b when I wrote them 2014-01-17 12:49:56 -07:00
Zixaphir
879206219b Oops 2014-01-16 00:51:47 -07:00
Zixaphir
9e6e9686e6 We don't need an entire method for a set of code we only use once 2014-01-15 15:25:57 -07:00
Zixaphir
481ca6af72 Fix and use thread.collect for GC
Also merge appchan's JSON option fixes
2014-01-14 17:18:30 -07:00
Zixaphir
45b8b07aec Release appchan x v2.8.5. 2014-01-14 13:13:24 -07:00
Zixaphir
0e184ec153 Allow multiple mascots to be imported at the same time 2014-01-14 01:25:49 -07:00
Zixaphir
141f9b6dd3 Release appchan x v2.8.4. 2014-01-13 21:09:21 -07:00
Zixaphir
0264edab7d Release appchan x v2.8.3. 2014-01-13 19:58:35 -07:00
Zixaphir
7d4f0be88f Release appchan x v2.8.2. 2014-01-13 19:37:55 -07:00
Zixaphir
b1cf10fbd2 Release appchan x v2.8.1. 2014-01-13 13:39:10 -07:00
Zixaphir
94dd0e555f Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Menu/Menu.coffee
2014-01-13 13:25:43 -07:00
Zixaphir
4da7bd827d Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
2014-01-13 13:11:19 -07:00
Zixaphir
971b7d971e Better QuoteInline process 2014-01-13 00:09:43 -07:00
Jordan
d7b140cc3b Release 4chan X v1.3.2. 2014-01-12 19:55:02 -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
seaweedchan
9a5ddc35d2 Merge zixaphirs typo fix
Close #237
2014-01-12 00:57:36 -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
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
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
Jordan
3aea514ca1 Release 4chan X v1.3.0. 2014-01-10 09:46:48 -07:00
Jordan
52a287f11f Announcement hiding button in font awesome
Close #231
2014-01-10 07:44:54 -07:00
Jordan
f217d94299 Menu button changes, close #223 2014-01-09 00:23:43 -07:00
Jordan
8419b7c88b Merge Zixaphir X, close #221 2014-01-08 20:55:13 -07:00
Zixaphir
23118608b2 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-01-07 08:58:33 -07:00
Zixaphir
ddabad15e9 Small optimization to Redirect code 2014-01-07 08:03:23 -07:00
Jordan
08ae1daee8 Release 4chan X v1.2.45. 2014-01-07 03:17:48 -07:00
Jordan
4735b8dae5 Update for 4cdn, maybe fix issues like #219? 2014-01-07 02:27:40 -07:00
Zixaphir
bde16c1a64 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-01-06 11:11:12 -07:00
Zixaphir
1c5c542ca1 And that should fix everything. Woo. 2014-01-06 08:45:17 -07:00
Zixaphir
6b3443c12a Continue implementing the random access list and generally
just optimizing Unread
2014-01-05 10:02:05 -07:00
Zixaphir
9a8e84c7d1 Release appchan x v2.7.5. 2014-01-04 15:38:05 -07:00