300 Commits

Author SHA1 Message Date
Mayhem
130462f3f9 Minor captcha fix. 2014-02-10 09:04:30 +01:00
Kabir Sala
a7b2565e5b Copy more from Zixaphir and Mayhem, proper(?) fix for Chrome 2014-02-10 04:45:04 +01:00
Zixaphir
762e733896 Lazy-merge Mayhem's captcha fixes
now back to skyrim.
2014-02-09 18:13:15 -07:00
Kabir Sala
6c2579449a Release 4chan X v1.3.4. 2014-02-10 01:57:43 +01:00
Kabir Sala
b368b0bbb4 Mayhem: Minor captcha fix. 2014-02-10 01:14:10 +01:00
Kabir Sala
1b6052304b Stuff 2014-02-09 21:43:31 +01:00
Mayhem
6b3495fb77 Minor captcha fix. 2014-02-09 19:46:44 +01:00
Kabir Sala
3bd506e617 Copy Mayhem 2014-02-09 19:36:28 +01:00
Mayhem
26954b6755 Fix captcha 2014-02-09 19:08:09 +01:00
Mayhem
a234bdb2a5 Merge pull request #1412 from MayhemYDG/catalog
Drop support for the inline catalog
2014-02-05 18:03:40 +01:00
Mayhem
e062f1626f Remove Cooldown Prediction. 2014-02-05 09:32:01 +01:00
Mayhem
5a29b74581 Fix title not being set on post previews in the QR when adding multiple files. 2014-02-05 09:22:30 +01:00
Mayhem
3887e184b8 Close #1416 2014-02-02 17:45:29 +01:00
Mayhem
c5490f6aec Fix cooldowns never expiring. 2014-02-01 15:41:36 +01:00
Mayhem
f080a15292 Merge branch 'v3' into catalog 2014-02-01 00:32:17 +01:00
Mayhem
2082e46cc5 typo
tee hee #1342
2014-02-01 00:01:17 +01:00
Mayhem
dac4ccbead Hide the persistent QR in the catalog. 2014-01-31 23:30:54 +01:00
Mayhem
c1e76c8805 Update deps. 2014-01-29 23:45:55 +01:00
Mayhem
1aa467b051 Remove all inline catalog-related code. 2014-01-29 16:25:52 +01:00
Zixaphir
5a5658bc60 Fix #557, Fix #554 2014-01-28 01:51:24 -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
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
f37484cd33 HTTPS for posting, always. 2014-01-19 16:20:21 -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
c94820e184 HTTPS for posting, always. 2014-01-19 15:25:22 -07:00
Zixaphir
3d0dd62556 Try to get some better errors out of QR.req.onerror 2014-01-19 15:18:57 -07:00
Zixaphir
b82ba8b620 A bit of cleanup of Rice. 2014-01-19 05:14:59 -07:00
Zixaphir
4a2249d0ec Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Navigate.coffee
	src/Posting/QR.coffee
2014-01-18 20:01:02 -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
99033cdffa Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
2014-01-17 19:08:56 -07:00
Zixaphir
c8514d1029 Fix posting when navigating to new boards via JSON 2014-01-17 16:24:49 -07:00
Zixaphir
cc7decfd34 Merge branch 'v3' 2014-01-17 13:23:36 -07:00
AchtBit
8c3e46d23b Fix wait error regex
There are 2 spaces separating the number of seconds.
2014-01-17 00:33:43 -06:00
Zixaphir
dc5daeba06 I really don't like iterating through objects. 2014-01-14 20:17:44 -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
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
c61c71c764 Fix the QR's state upon navigation with JSON 2014-01-10 22:54:30 -07:00
Zixaphir
890277f296 Update QR depending on state. 2014-01-09 23:20:38 -07:00
Zixaphir
996080cab9 Merge branch 'v3'
Conflicts:
	Gruntfile.coffee
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Menu/Menu.coffee
	src/Posting/QR.coffee
2013-12-25 11:23:41 -07:00
Zixaphir
b38f63e313 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.coffee
	src/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/lib/$.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
2013-12-25 10:54:21 -07:00
Zixaphir
af666d38cd Merge branch 'v3'
Conflicts:
	src/Posting/QuickReply.coffee
2013-12-24 16:32:48 -07:00
Zixaphir
8bad58920a Fix not var in obj, var not in obj 2013-12-24 16:31:09 -07:00
Zixaphir
ae789f4ad8 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Index.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/Posting/QuickReply.coffee
2013-12-24 16:18:47 -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
Mayhem
a646d532b2 Split QR.coffee into multiple files. 2013-12-19 04:34:37 +01:00
Zixaphir
12adc14ea0 Release appchan x v2.6.2. 2013-11-27 17:18:16 -07:00
Zixaphir
2f7dd5a185 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/script.js
2013-11-26 12:22:13 -07:00
Zixaphir
cadbea75b2 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	package.json
2013-11-26 12:19:19 -07:00
Mayhem
af21becff6 Fix #1347. 2013-11-25 13:21:37 +01:00
Zixaphir
3ad1c6040c Redo FontAwesome stuff, I guess. 2013-11-23 13:23:36 -07:00