217 Commits

Author SHA1 Message Date
ccd0
8df52a0b24 Merge from Appchan X: Whitespace and other changes not affecting compiled script. 2015-01-31 02:50:38 -08:00
ccd0
43454eae88 WebMs with sound sighted on /wsg/! 2015-01-30 22:00:08 -08:00
ccd0
c1a1710f81 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-26 23:22:24 -08:00
ccd0
550d0dbd75 Fix Thread Updater setting description. #303 2015-01-26 21:59:55 -08:00
hotdogman
50b98e2a4b Enable pinning of watched threads by default
Pin/anchor watched threads to the top of the catalog by default.
2015-01-26 22:35:07 -06:00
ccd0
bed88c3324 Remove contract button; work around controls by estimating their position. 2015-01-25 09:41:48 -08:00
ccd0
240a57c72c Add timer for thread watcher. 2015-01-11 10:51:08 -08:00
ccd0
501c0c3c62 Revert "Use our own thread excerpt for /pol/ instead of 4chan's."
This reverts commit f302befec7c392108b1640343bc6ec5a38c8d92f.
2015-01-10 20:50:57 -08:00
ccd0
9d7da5817e 4chan X -> meta.name 2015-01-10 19:01:15 -08:00
ccd0
4cf3e29310 Update sauce examples. 2015-01-06 17:47:15 -08:00
ccd0
79dedbcb2b Add note to settings about the mixed content situation. 2015-01-03 13:22:39 -08:00
ccd0
9257ca2df2 Defaults: Filtered Backlinks -> false, File info -> truncated filename. 2014-12-31 20:34:39 -08:00
ccd0
926557ec08 Fix setting description. 2014-12-28 22:05:59 -08:00
ccd0
b817c43d55 Use 4chan X Catalog -> on by default 2014-12-27 21:14:11 -08:00
ccd0
1d47e2d4be Make disabling the native extension optional. #61 2014-12-27 19:13:31 -08:00
ccd0
0e86ef0209 Merge branch 'Beta' 2014-12-26 16:10:23 -08:00
ccd0
790c064192 This is not a suboption. 2014-12-26 15:56:01 -08:00
ccd0
fc6dc34717 Better description. 2014-12-26 02:12:42 -08:00
ccd0
2c7afab50f Merge ihavenoface's Floating Embeds. #47 2014-12-26 01:04:05 -08:00
ccd0
f302befec7 Use our own thread excerpt for /pol/ instead of 4chan's. 2014-12-25 12:27:34 -08:00
ccd0
a57f7950f0 Remove marquee stopping from AntiAutoplay. Instead hide marquees within posts unconditionally. 2014-12-25 12:06:42 -08:00
ccd0
1f380ffc67 Implement nested options. #248 2014-12-23 14:37:39 -08:00
ccd0
02f74448fa Make 'Relative Date Title' a suboption of 'Relative Post Dates'. 2014-12-23 09:56:01 -08:00
ccd0
f104e39a87 Defaults: Relative Date Title overrides Relative Post Dates. 2014-12-22 17:44:12 -08:00
ccd0
d374b39ebd Add note about 4chan X Catalog and "JSON Navigation" option. 2014-12-22 09:21:39 -08:00
ccd0
0a3bf24570 More option moving. 2014-12-21 18:48:46 -08:00
ccd0
db261f1358 Make Fappe Tyme not persist between pages. #70 2014-12-20 15:41:06 -08:00
ccd0
6a8c28fdb7 Merge ihavenoface's Relative Date Title implementation directly, rather than the prior coffee->js->coffee translation. #161 2014-12-20 14:43:54 -08:00
ccd0
ca4339a57d Relative Date Title #161 2014-12-18 18:57:57 -08:00
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
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
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
ccd0
898464cfab Add 'Post on Captcha Completion' option. 2014-12-09 15:14:25 -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
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
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
a70e273597 Implement 'Disable Autoplaying Sounds' option. 2014-12-04 13:46:20 -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
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
45de46a5f4 Auto Watch and Auto Watch Reply are now disabled by default. 2014-11-13 03:25:17 -08:00
ccd0
70a8c639c3 Implement Mark New IPs. #190 2014-11-12 03:36:07 -08:00