399 Commits

Author SHA1 Message Date
ccd0
2680033206 The 5 minute thread cooldown only applies between boards. 2015-02-14 19:04:24 -08:00
ccd0
9e1f2b4d0c Change thread selector back to 'Thread No.' 2015-02-07 17:33:05 -08:00
ccd0
c70921e176 Merge branch 'master' into zixaphir-merge
Conflicts:
	src/Filtering/Filter.coffee
	src/General/Index.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/IDColor.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QR.coffee
2015-02-01 13:41:36 -08:00
ccd0
bd742bcc35 Fix errors from changing QR shortcut before added to document. 2015-01-31 12:01:17 -08:00
ccd0
a85d5b2335 Don't pause WebMs with audio when off screen. 2015-01-31 11:48:28 -08:00
ccd0
8df52a0b24 Merge from Appchan X: Whitespace and other changes not affecting compiled script. 2015-01-31 02:50:38 -08:00
ccd0
a00f4a9871 /gif/ and /wsg/ allow audio and a larger duration limit. 2015-01-31 02:33:54 -08:00
ccd0
25da29625e Revert "Remove check for audio until we get word on where it's allowed."
This reverts commit 76639c1299db2e7e84c9fb3e54d4f8f379f46794.
2015-01-31 02:03:27 -08:00
ccd0
2592e239e5 Merge from Appchan X: src/Posting 2015-01-31 01:35:58 -08:00
ccd0
8e3abdbe7a Read max WebM filesize from the page. 2015-01-31 00:19:06 -08:00
ccd0
76639c1299 Remove check for audio until we get word on where it's allowed. 2015-01-30 22:07:52 -08:00
ccd0
94928b7c83 Merge from Appchan X: Whitespace and other changes not affecting compiled script. 2015-01-30 01:22:40 -08:00
ccd0
afa6ec9dd4 Merge branch 'bstable' into bbeta
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
2015-01-27 10:52:15 -08:00
ccd0
b2f11910b3 Fix reloading of noscript captcha images that failed to load the first time. 2015-01-27 10:46:22 -08:00
ccd0
91d4e2434a Remove some redundant CloseMenu events. 2015-01-25 18:24:58 -08:00
ccd0
e079c55e60 Consolidate QR Shortcut code. 2015-01-25 18:19:31 -08:00
ccd0
930a8a4307 Remove /pol/ flags properly. 2015-01-25 14:57:39 -08:00
ccd0
fce15eced5 Revert "Turn off /pol/ flags for now."
This reverts commit 60266a686d5f009a88641d5ba451d37f5e879519.

Conflicts:
	src/General/Build.coffee
2015-01-25 14:02:09 -08:00
ccd0
b93ee0fb11 Fix quoting-you in thread watcher on /archive page. 2015-01-25 13:59:25 -08:00
ccd0
9d7da5817e 4chan X -> meta.name 2015-01-10 19:01:15 -08:00
ccd0
050daf3f1a Disable QR on archived thread page until it actually works. 2015-01-04 17:01:20 -08:00
ccd0
9c1059c39c Revert "Temporarily hard-enable captcha on /b/."
This reverts commit 3ea1f44429ca2c21d37e848285863578ae7c7591.
2015-01-04 00:09:26 -08:00
ccd0
3ea1f44429 Temporarily hard-enable captcha on /b/. 2015-01-03 23:38:23 -08:00
ccd0
79e373382e Fixes for QR focus logic. 2014-12-26 14:22:31 -08:00
ccd0
69cf03df4d Remove unused queryChallenge code. 2014-12-23 00:52:23 -08:00
ccd0
289b4f8885 Actually fix double captcha image loading issue. 2014-12-23 00:44:05 -08:00
ccd0
323410cf00 Reload captcha when needed even if we don't focus on it. 2014-12-22 21:07:20 -08:00
ccd0
d276952cee Remove scroll lock break on mouse usage. 2014-12-22 21:06:30 -08:00
ccd0
692e3d4dd3 Remove captcha destruction on Esc keybind, and restoration on QR unhide. 2014-12-22 13:37:15 -08:00
ccd0
add0f3d3a2 Revert "Destroy captcha when QR is hidden."
This reverts commit f2260ca2ac3dc7060a33eee77f7ccace21e8f6fe.

Conflicts:
	src/Posting/QR.coffee
2014-12-22 12:04:37 -08:00
ccd0
6c639fe20f Hide old captcha image while reloading. 2014-12-22 09:39:38 -08:00
ccd0
98b392480a Avoid double loading of captcha image. 2014-12-22 08:47:48 -08:00
ccd0
59e11503f0 Stop anomalous scrolling on space/tab in captcha iframe. #231
This is seriously hacky, but probably better than ignoring the issue.
Improvements welcome.
2014-12-21 20:35:22 -08:00
ccd0
d747b3de12 Include Recaptcha popup bubble in QR focus test. 2014-12-21 20:14:14 -08:00
ccd0
f2260ca2ac Destroy captcha when QR is hidden. 2014-12-21 18:17:53 -08:00
ccd0
dd7dbf80f4 Fix QR hiding issue.
We should now be able to tell when the QR is focused even when
within the captcha <iframe>.  No longer need to hold open QR when
there is a captcha.
2014-12-21 17:36:00 -08:00
ccd0
a9e7240547 Minor fix. 2014-12-21 15:49:16 -08:00
ccd0
44cd4d842a Prevent unnecessary loading of fallback iframe when Javascript is disabled. 2014-12-21 12:24:01 -08:00
ccd0
5fc2e7946f Reduce code duplication with Get.scriptData. 2014-12-20 12:31:15 -08:00
ccd0
6680449cdc 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-15 21:00:01 -08:00
ccd0
60266a686d Turn off /pol/ flags for now. 2014-12-15 19:02:40 -08:00
ccd0
eb66e08545 Comment doesn't apply to this fork. 2014-12-14 23:45:45 -08:00
ccd0
ce7f360951 Add threads to the QR thread selector when you view a quoted post from one of them.
An accidental feature that I'm making work consistently.
2014-12-14 23:39:36 -08:00
ccd0
545d93a5fd Firefox leaves list.value as-is when set to an invalid option.
Chromium sets it to the empty string.
2014-12-14 21:37:29 -08:00
ccd0
8230156c51 Quote inlined cross-board posts correctly. 2014-12-14 21:05:16 -08:00
ccd0
512fd1f78d Add nodes.quote to Post object. 2014-12-14 20:28:33 -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
8600675171 Fix captcha in GM 1.15. 2014-12-12 21:49:06 -08:00