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

286 Commits

Author SHA1 Message Date
ccd0
ff8ddc347c Fix gallery fit width in Firefox. zixaphir/appchan-x#824 2015-01-19 16:15:57 -08:00
ccd0
e740bf8969 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
 2015-01-13 19:02:14 -08:00
ccd0
81b03063cf Better treatment of bottom board list. #291 
Should fix conflict with native catalog.
 2015-01-13 18:52:32 -08:00
ccd0
a4a8b85f8c Make reply hiding button insertion more efficient. 2015-01-12 00:14:26 -08:00
ccd0
9737cb47d5 Highlight thread watcher icon when there are unread replies and the thread watcher is hidden. 2015-01-11 14:47:05 -08:00
ccd0
3aafc75844 Color quoted text in archived thread list. #275 2015-01-04 16:56:01 -08:00
ccd0
a357ffb72a 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
 2015-01-04 11:33:32 -08:00
ccd0
7a8ee622c2 More aggressive <marquee> removal. 2015-01-04 11:31:21 -08:00
ccd0
e1222d5d4b Fix newlines in catalog [code] blocks, and add background color. #263 2014-12-31 19:55:24 -08:00
ccd0
354f2b5b55 Fix Quote Hash Navigation causing filtered backlinks to not be hidden properly. 2014-12-29 22:54:50 -08:00
ccd0
2c7afab50f Merge ihavenoface's Floating Embeds. #47 2014-12-26 01:04:05 -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
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
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
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
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
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
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
a70e273597 Implement 'Disable Autoplaying Sounds' option. 2014-12-04 13:46:20 -08:00
ccd0
a2afb1078b Fix thread stats not being draggable by IP count or page. 2014-11-16 20:27:48 -08:00
ccd0
dc0cc65fd3 Move index mode to <select> in navlinks line. 2014-11-13 23:54:51 -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
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
8dffc3a8fd Override some 4chan catalog CSS that was messing up the settings dialog. 2014-10-27 23:37:06 -07:00
milky
c0a4467d0d Convert anchor to text node. 
Conflicts:
	src/General/Header.coffee
	src/General/css/style.css
 2014-10-26 15:41:36 -07:00
milky
555f3c9867 Clearer when archive links are N/A. 
Conflicts:
	src/General/Header.coffee
	src/General/css/style.css
 2014-10-26 15:39:57 -07:00
ccd0
2646e3d4f8 Remove unused CSS. 2014-10-25 20:08:01 -07:00
ccd0
29d7e35840 #board-list has display:inline, so this has no effect. 2014-10-25 18:24:05 -07:00
ccd0
752504a148 Move unread count in thread watcher to the left. 2014-10-19 16:00:38 -07:00
ccd0
b2dc8ca341 Increase size of draggable region on floating update counter. #165 2014-10-18 15:31:26 -07:00
ccd0
e5b2c3f5fd Merge branch '1.9.6.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-10-16 12:14:28 -07:00