1254 Commits

Author SHA1 Message Date
ccd0
7f7ae9917e Merge branch 'Beta' 2014-12-15 21:06:41 -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
dd62735fc1 Have 'Disable Autoplaying Sounds' stop <marquee> too. 2014-12-15 20:47:15 -08:00
ccd0
0b2603412f Update 'Disable Autoplaying Sounds' for Youtube videos. 2014-12-15 20:12:11 -08:00
ccd0
60266a686d Turn off /pol/ flags for now. 2014-12-15 19:02:40 -08:00
ccd0
bd84275ac2 Defaults changes, move QR Shortcut to Posting section. 2014-12-15 00:57:23 -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
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
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
08050f33f1 Use noscript fallback for captcha. 2014-12-11 22:53:03 -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
ccd0
898464cfab Add 'Post on Captcha Completion' option. 2014-12-09 15:14:25 -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
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
ccd0
84609c40f3 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-08 22:06:33 -08:00
ccd0
0baec018e9 captcha-section -> captcha-root 2014-12-08 19:13:50 -08:00
ccd0
9560ccf7b2 Merge tag 'Stable' into Beta
4chan X v1.9.14.5.

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
	src/Posting/QR.captcha.coffee
2014-12-08 15:27:19 -08:00
ccd0
4220328929 Merge branch 'recaptcha2' into Stable 2014-12-08 14:44:14 -08:00
ccd0
6e87814f3e Defaults changes. 2014-12-08 11:02:33 -08:00
ccd0
8db43ab04b Add "Pin watched threads" option. #187
Also add Alt+click and menu item to watch threads in catalog.
2014-12-07 23:31:49 -08:00
ccd0
9959524c47 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-07 16:53:00 -08:00
ccd0
04317e36be Center controls added to audio. 2014-12-07 16:42:19 -08:00
ccd0
eb30e705dd Improve focusing. Place captcha counter on top of captcha. 2014-12-06 17:43:04 -08:00
ccd0
2fb6eb5f45 Remove positive tabindex. 2014-12-06 14:49:55 -08:00
ccd0
7b348a00c6 Fix Remove Spoilers stripping tags. 2014-12-06 01:06:31 -08:00
ccd0
8d33726c22 Merge branch 'master' into recaptcha2 2014-12-05 18:09:26 -08:00
ccd0
486f64baa5 Prepare for Recaptcha 2. 2014-12-05 18:09:07 -08:00
ccd0
fcb767e5de 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-04 13:50:43 -08:00
ccd0
a70e273597 Implement 'Disable Autoplaying Sounds' option. 2014-12-04 13:46:20 -08:00
ccd0
c38c37c720 Overhaul quote threading.
- Separate post order data from read/unread status.
- Make compatible with unread line and scroll to last read post.
- Implement [Thread New Posts] link.
2014-11-30 12:46:07 -08:00
ccd0
748258f59b Unread.postsQuotingYou -> ECMAScript 6 Set 2014-11-28 23:28:01 -08:00
ccd0
e8c6403ce6 Add guard against inserting an item after/before itself. 2014-11-23 20:28:52 -08:00
ccd0
f92fb4a1c4 Don't make Fullscreen Gallery default. 2014-11-22 20:11:07 -08:00
ccd0
bd2c8a1ae3 Increase default slide delay to 6s. 2014-11-22 19:59:55 -08:00
ccd0
d08583e2e6 Exit gallery on fullscreen exit. 2014-11-22 19:52:26 -08:00
ccd0
ff7793bb96 Make some of the gallery keybinds configurable. 2014-11-22 19:16:22 -08:00
ccd0
e9802b3458 Implement Fullscreen Gallery option. 2014-11-22 18:13:55 -08:00
ccd0
b4bbb687c5 Merge branch '1.9.11.x'
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-11-17 21:40:10 -08:00
ccd0
f7759216ca Fix bugs in loading from HTTP-only archives on HTTPS pages. 2014-11-17 21:20:10 -08:00
ccd0
a2afb1078b Fix thread stats not being draggable by IP count or page. 2014-11-16 20:27:48 -08:00
ccd0
8bcec61542 Reduce unnecessary calls to GM_getValue. 2014-11-16 17:19:30 -08:00
ccd0
e5318e2615 Merge branch '1.9.11.x' 2014-11-16 12:39:51 -08:00
ccd0
bee23e83fe Fix quoted text color in 4chan X catalog. 2014-11-16 06:48:56 -08:00
ccd0
4ac31962a2 Move nameBlock into post class. 2014-11-15 20:41:32 -08:00
ccd0
dc0cc65fd3 Move index mode to <select> in navlinks line. 2014-11-13 23:54:51 -08:00
ccd0
45de46a5f4 Auto Watch and Auto Watch Reply are now disabled by default. 2014-11-13 03:25:17 -08:00