2940 Commits

Author SHA1 Message Date
ccd0
8230156c51 Quote inlined cross-board posts correctly. 2014-12-14 21:05:16 -08:00
ccd0
28a0064a67 Allow for extensions that add text to link titles (#220?)
e.g. NoScript's Javascript link fixer.
2014-12-14 20:41:40 -08:00
ccd0
e1150b0d7a Add nameBlock to clone nodes also. 2014-12-14 20:33:56 -08:00
ccd0
512fd1f78d Add nodes.quote to Post object. 2014-12-14 20:28:33 -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
f6c3cef282 Fix errors found by JSHint. 2014-12-14 12:31:52 -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
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
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
ccd0
9f1f635aac Fetched quotes may create threads without OPs. 2014-12-12 13:12:33 -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
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
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
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
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
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
9e147b26b0 Disable 4chan's reported post hiding code. #219 2014-12-10 21:35:44 -08:00
ccd0
3744cf8120 Turn Catalog Links off by default in stable version also. 2014-12-10 21:35:31 -08:00
ccd0
74540e4b71 Also check descendants of inserted nodes.
Possibly fixes the copy+paste captcha?
2014-12-10 21:35:18 -08:00
ccd0
8832897d3a Revert "Merge branch 'old-captcha'; allow selection of old or new captcha."
This reverts commit c7433d9271717df3f0f8d64e22abf73e85f8a5ca, reversing
changes made to 68dbb73c4eceec13cdc56550f8181adc28ab65a2.
2014-12-10 14:30:29 -08:00
ccd0
dafecca7e3 Revert "On closer examination, the captcha is accepting more or less arbitrary input."
This reverts commit 1681beaab8c0af4504534011ef98401edaa16cec.
2014-12-10 14:25:12 -08:00
ccd0
caeb8b9344 Revert "Remove captcha doubling. Only change now made to v1 captcha is [blank captcha] -> "al pacino"."
This reverts commit f543232af98677910ce17ec0e690db1f9c0192a9.
2014-12-10 14:24:16 -08:00
ccd0
f543232af9 Remove captcha doubling. Only change now made to v1 captcha is [blank captcha] -> "al pacino". 2014-12-10 03:30:41 -08:00
ccd0
1681beaab8 On closer examination, the captcha is accepting more or less arbitrary input.
Enjoy your free pass while it lasts.
2014-12-10 02:53:06 -08:00
ccd0
c7433d9271 Merge branch 'old-captcha'; allow selection of old or new captcha. 2014-12-10 01:53:33 -08:00
ccd0
d616d864eb Use Floens's trick to get Recaptcha v1 working again. 2014-12-10 01:29:53 -08:00
ccd0
68dbb73c4e 'Cycle sort type' keybind only works on index. 2014-12-09 17:57:07 -08:00
ccd0
898464cfab Add 'Post on Captcha Completion' option. 2014-12-09 15:14:25 -08:00
ccd0
92cfb4be1f 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-09 11:14:26 -08:00
ccd0
c97cbc252e Fix race condition between our setup and Google's. 2014-12-09 11:10:58 -08:00
ccd0
0074f23d55 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-09 04:57:22 -08:00
ccd0
9c4405fd8c Don't let QR.captcha.captchas become undefined. 2014-12-09 04:51:15 -08:00
ccd0
f53937af2f 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-09 03:43:59 -08:00
ccd0
72f15330fc Captcha container need not exist when destroy() is called. 2014-12-09 03:39:38 -08:00
ccd0
4c86bbf7be Revert "expand original post form when not hidden (except in catalog)"
It interferes with captcha loading on the original post form.

This reverts commit 66e402031cac75d5d8c96e667bb6e75fb196dc2f.

Conflicts:
	src/General/css/style.css
2014-12-09 02:26:11 -08:00