7698 Commits

Author SHA1 Message Date
ccd0
551e9d0482 Fix CHANGELOG.md 2014-12-14 12:42:28 -08:00
ccd0
0af7fb727b Merge branch 'Stable' into Beta
Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
2014-12-14 12:41:31 -08:00
ccd0
86bbccb83d Release 4chan X v1.9.15.20. 2014-12-14 12:33:12 -08:00
ccd0
f6c3cef282 Fix errors found by JSHint. 2014-12-14 12:31:52 -08:00
ccd0
c919a8672b Use JSHint. 2014-12-14 12:14:56 -08:00
ccd0
fa2265570b Release 4chan X v1.9.16.0. 2014-12-13 10:48:26 -08:00
ccd0
af111918ae Merge branch 'master' into noscript 2014-12-13 08:24:57 -08:00
ccd0
274190e6bb Detect when Javascript is disabled on the page and use the noscript captcha. 2014-12-13 08:22:06 -08:00
ccd0
e028273eed Unify captcha module interfaces. 2014-12-13 07:56:36 -08:00
ccd0
b4da855d3d Merge branch 'Stable' 2014-12-12 21:51:58 -08:00
ccd0
6f80f433bf Release 4chan X v1.9.15.19. 2014-12-12 21:50:04 -08:00
ccd0
8600675171 Fix captcha in GM 1.15. 2014-12-12 21:49:06 -08:00
ccd0
183f878f0c Fix reloading bug. 2014-12-12 19:19:29 -08:00
ccd0
75c572adbe Merge branch 'Stable' 2014-12-12 18:11:34 -08:00
ccd0
5d6336dbf4 Release 4chan X v1.9.15.18. 2014-12-12 18:07:12 -08:00
ccd0
d8f3ae1a1e Merge remote-tracking branch 'archives/master' into Stable 2014-12-12 18:05:32 -08:00
ccd0
e206c90751 Merge branch 'master' into noscript 2014-12-12 18:01:01 -08:00
ccd0
76507b6a34 Merge commit '68dbb73' into noscript; allow selection of noscript or Javascript captcha.
Similar to reverted merge commit c7433d9271717df3f0f8d64e22abf73e85f8a5ca.

Conflicts:
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
2014-12-12 17:59:14 -08:00
ccd0
77f3639772 Merge tag '1.9.15.4' into noscript
4chan X v1.9.15.4.

Conflicts:
	src/Posting/QR.captcha.coffee
2014-12-12 16:36:20 -08:00
Mayhem
ecb4a1e8c5 Merge pull request #13 from bakugo/patch-1
/k/ full images on archive.moe
2014-12-13 00:29:59 +01:00
Bakugo
f46dc03a6c /k/ full images on archive.moe 2014-12-12 23:23:51 +00:00
ccd0
9f1f635aac Fetched quotes may create threads without OPs. 2014-12-12 13:12:33 -08:00
ccd0
dcba1b77de Merge branch 'Beta' 2014-12-11 23:45:49 -08:00
ccd0
847689832e Release 4chan X v1.9.15.17. 2014-12-11 23:43:25 -08:00
ccd0
a082218741 This also needs a $.forceSync. 2014-12-11 23:42:11 -08:00
ccd0
5476f6a61f Merge branch 'Stable' into Beta
Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
2014-12-11 23:34:14 -08:00
ccd0
8c21c1d25e Release 4chan X v1.9.14.13. 2014-12-11 23:33:12 -08:00
ccd0
381d000ef9 Increase height of report popup to accomodate new captcha. 2014-12-11 23:31:09 -08:00
ccd0
0a25ca06d8 Merge remote-tracking branch 'archives/master' into Stable
Conflicts:
	src/Archive/archives.json
2014-12-11 23:15:45 -08:00
ccd0
08050f33f1 Use noscript fallback for captcha. 2014-12-11 22:53:03 -08:00
Mayhem
17a6c7ca9d Merge pull request #12 from talichan/patch-8
cleanup
2014-12-11 20:16:39 +01:00
Kevin
7d418166c8 cleanup
told ya
2014-12-11 20:15:41 +01:00
ccd0
58963ca57c Build web page. 2014-12-11 09:02:24 -08:00
ccd0
082d1f8c44 Make info about Chrome store more prominent. 2014-12-11 09:02:15 -08:00
ccd0
ca90d4507d Release 4chan X v1.9.15.16. 2014-12-11 08:34:11 -08:00
ccd0
610de06238 Merge branch 'Stable' into Beta
Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
2014-12-11 08:32:53 -08:00
ccd0
fa58f8ea68 Release 4chan X v1.9.14.12. 2014-12-11 08:28:03 -08:00
ccd0
f870c6749c Restore captcha when autohidden QR comes back into focus. 2014-12-11 08:26:53 -08:00
ccd0
77aa3689ea Typing in cleared post should re-setup captcha. 2014-12-11 07:59:26 -08:00
ccd0
b1968b3ebe Release 4chan X v1.9.15.15. 2014-12-11 07:49:15 -08:00
ccd0
2cbf434193 Merge branch 'Stable' into Beta
Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
2014-12-11 07:46:31 -08:00
ccd0
e9595c58ee Release 4chan X v1.9.14.11. 2014-12-11 07:40:48 -08:00
ccd0
b1fc7e5866 Close captcha on Esc so that QR hides. #233 2014-12-11 07:34:43 -08:00
ccd0
6d9eed4721 Close captcha on Esc so that QR hides. #233 2014-12-11 00:11:01 -08:00
ccd0
a6d609c48a Release 4chan X v1.9.15.14. 2014-12-10 22:22:17 -08:00
ccd0
a289289c18 Captcha should reload if 'Post on Captcha Completion' will start dumping. 2014-12-10 22:17:52 -08:00
ccd0
75a1c64edc Fix Post on Captcha Completion halting autoposting when you finish entering captchas. 2014-12-10 22:08:17 -08:00
ccd0
31ae2a687c Merge branch 'Stable' into Beta
Conflicts:
	LICENSE
	builds/4chan-X-beta.crx
	builds/4chan-X-beta.meta.js
	builds/4chan-X-beta.user.js
	builds/4chan-X-noupdate.crx
	builds/4chan-X-noupdate.user.js
	builds/4chan-X.crx
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/4chan-X.zip
	builds/updates-beta.xml
	builds/updates.xml
	package.json
2014-12-10 22:07:56 -08:00
ccd0
aa139b394b Release 4chan X v1.9.14.10. 2014-12-10 22:01:14 -08:00
ccd0
9e147b26b0 Disable 4chan's reported post hiding code. #219 2014-12-10 21:35:44 -08:00