Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,222 Commits 2 Branches 0 Tags
Commit Graph

2825 Commits

Author SHA1 Message Date
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
Zixaphir
020a68f73a Merge ccd0's IP Count stuff 2014-12-09 00:28:38 -07: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
Zixaphir
0389bcf930 Merge remote-tracking branch 'origin/master' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-12-08 22:57:37 -07:00
Zixaphir
89cb5a6b6b Merge Recaptcha v2 changes from ccd0/4chan-x 2014-12-08 22:55:49 -07: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
7688865664 Profile post callbacks. 2014-11-16 16:33:42 -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
ccd0
70a8c639c3 Implement Mark New IPs. #190 2014-11-12 03:36:07 -08:00
ccd0
24f5a743f7 Move read of initial IP count to Main.coffee; also read bump/image limit. 2014-11-11 21:17:36 -08:00
ccd0
c4518fbb06 Merge branch '1.9.10.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-11 00:06:51 -08:00
ccd0
5473f8081e Fix Hide Original Post Form (broken by 4chan update). 2014-11-11 00:00:32 -08:00
ccd0
700085107f Make IP count in thread stats optional. 2014-11-10 03:10:57 -08:00
ccd0
0ec7fca9b8 Revert "Revert "add beta/dev to userscript names so beta/developement versions can be installed alongside stable"" 
This reverts commit dbea116828854ad7982e46649aa6e7c9c9346e84.
 2014-11-10 01:49:13 -08:00
ccd0
dbea116828 Revert "add beta/dev to userscript names so beta/developement versions can be installed alongside stable" 
This reverts commit 047381bb5d6637c2e762c57d3aca53aa587a9b29.
 2014-11-10 01:13:06 -08:00
ccd0
ea163382d6 Make IP count in thread stats optional. 2014-11-09 14:18:03 -08:00
ccd0
b09fadb744 Change index sort keybind from Ctrl+x to Alt+x. 2014-11-09 03:51:55 -08:00
Mayhem
afa889d128 Add keybind to cycle through index sort types. 
Conflicts:
	CHANGELOG.md
	src/General/Config.coffee
	src/General/Index.coffee
	src/Miscellaneous/Keybinds.coffee
 2014-11-09 03:47:59 -08:00
Mayhem
73a5bcfdee Add Image Size. 
Conflicts:
	CHANGELOG.md
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Index.coffee
	src/General/css/style.css
 2014-11-08 19:20:20 -08:00
ccd0
5ca2cbc46f Revert "remove CSS for #index-size until actually implemented" 
This reverts commit c47c800de7c1b3dc00eac6424bce4a675ddcd35a.

Conflicts:
	src/General/css/style.css
 2014-11-08 15:37:07 -08:00
ccd0
aaeff46c2b Fix ID highlighting. 2014-11-02 18:15:12 -08:00