8 Commits

Author SHA1 Message Date
ccd0
f2260ca2ac Destroy captcha when QR is hidden. 2014-12-21 18:17:53 -08:00
ccd0
a9e7240547 Minor fix. 2014-12-21 15:49:16 -08:00
ccd0
af111918ae Merge branch 'master' into noscript 2014-12-13 08:24:57 -08:00
ccd0
e028273eed Unify captcha module interfaces. 2014-12-13 07:56:36 -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
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
c7433d9271 Merge branch 'old-captcha'; allow selection of old or new captcha. 2014-12-10 01:53:33 -08:00