717 Commits

Author SHA1 Message Date
Zixaphir
7301f43289 Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/css/yotsuba-b.css
	src/Images/FappeTyme.coffee
2014-03-06 23:07:49 -07:00
Zixaphir
1de6c29a51 Fix captcha (again) 2014-03-06 21:38:31 -07:00
Zixaphir
2aa679360d Merge branch 'v3' 2014-03-06 21:20:48 -07:00
Zixaphir
d5fa356e2c Merge branch 'master' of github.com:zixaphir/appchan-x
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-03-06 20:46:08 -07:00
Zixaphir
ac20dcf81f Handle option.disabled 2014-03-06 20:43:33 -07:00
Zixaphir
c440c236ad Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
2014-03-06 20:18:33 -07:00
Zixaphir
fe8c67e03e Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Navigate.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Features/Index-navlinks.html
	src/Miscellaneous/CustomCSS.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/QuoteYou.coffee
2014-03-06 20:15:45 -07:00
Brandon
03d4405363 fix reveal spoilers 2014-03-06 12:56:27 -08:00
Brandon
b65db1ba7d switch from .navLinks to .swfSauce on /f/
did this to not have it hide when ‘Hide Navlinks’ is enabled
2014-03-05 22:15:16 -08:00
Brandon
23a82cd795 a few more /f/ tweaks
It’s almost presentable! 🎈
2014-03-05 19:51:25 -08:00
Brandon
8a4a76f376 some more css fixing for /f/
still needs fixing for larger resolutions.
2014-03-05 17:19:31 -08:00
Brandon
58ff148875 quotes
🐦
2014-03-05 14:23:06 -08:00
Brandon
7dc1f8d600 /f/ cleanup 2014-03-05 13:57:43 -08:00
Brandon
2d3e935a34 Minor fix for /f/
Highlighted posts had an overlap with the highlighting and the fileInfo.
2014-03-05 13:36:10 -08:00
Zixaphir
5e10d45f4b Give CustomCSS's style sheet an ID 2014-02-23 08:29:27 -07:00
Zixaphir
3a8ccfc237 Move Flash features into their own function
Also standardize code
2014-02-23 08:23:11 -07:00
Zixaphir
56ed876be8 Merge branch 'master' of git://github.com/vampiricwulf/appchan-x
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-02-23 08:05:27 -07:00
Zixaphir
b30276eee3 Release appchan x v2.8.13. 2014-02-20 12:58:45 -07:00
Zixaphir
67256bcf6d Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
2014-02-20 12:58:05 -07:00
Zixaphir
31a444e319 Quick CSS fixes 2014-02-20 12:55:26 -07:00
Zixaphir
f1cf2a7828 Get rid of excess space in vertical icons orientation 2014-02-18 10:03:33 -07:00
Brandon
a0049f0b7f Add sauce to /f/ 2014-02-17 16:32:09 -08:00
Brandon
f7a3044409 Fix /f/ FappeTyme 2014-02-17 15:08:11 -08:00
Brandon
785bc4297c /f/ embed and navLinks 2014-02-17 15:03:56 -08:00
Zixaphir
7c622e0ba2 opensuse emoji 2014-02-17 09:04:08 -07:00
Zixaphir
1aeee61fcd Release appchan x v2.8.12. 2014-02-17 08:29:17 -07:00
Zixaphir
0d7668472f Fix #586 2014-02-17 07:33:32 -07:00
Brandon
e4a781cea6 basic /f/ fixup css 2014-02-16 12:33:39 -08:00
Zixaphir
0b65c2af56 Release appchan x v2.8.11. 2014-02-16 05:58:51 -07:00
Zixaphir
4e4bff6a54 Oops 2014-02-16 05:58:23 -07:00
Zixaphir
5628c117fc Release appchan x v2.8.10. 2014-02-16 05:50:58 -07:00
Zixaphir
62f42508c2 Less redundancy 2014-02-16 05:47:45 -07:00
Zixaphir
20ee5dc809 Try again to be less crazy controlling about non-appchan stylesheets 2014-02-16 05:44:01 -07:00
Zixaphir
3c102d4823 Fix #568 2014-02-16 05:22:35 -07:00
Zixaphir
a9ff7e8d7e Fix Gallery menu-button 2014-02-16 04:40:35 -07:00
Zixaphir
57dab55dcb Add an option to hide navLink UI. #572 2014-02-16 04:37:12 -07:00
Zixaphir
7f69ba59fb resolve #472 2 2014-02-16 04:25:29 -07:00
Zixaphir
9dc9d96574 Unread part of #579 2014-02-16 04:16:33 -07:00
Zixaphir
cab9cef36e Remove last ad plea 2014-02-16 04:10:30 -07:00
Zixaphir
51219252aa Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
2014-02-16 04:02:31 -07:00
Zixaphir
ff1467b7e5 Fix #581, Fix #580 2014-02-16 02:32:33 -07:00
Zixaphir
32ef5929cd Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
2014-02-16 02:28:12 -07:00
Zixaphir
d11b435134 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/icon16.png
	builds/crx/icon48.png
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/html/Features/QuickReply.html
	src/General/img/icon16.png
	src/General/img/icon48.png
	src/Miscellaneous/Emoji.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
2014-02-16 02:17:36 -07:00
Zixaphir
a9de36ca63 Release appchan x v2.8.9. 2014-02-09 18:14:13 -07:00
Zixaphir
762e733896 Lazy-merge Mayhem's captcha fixes
now back to skyrim.
2014-02-09 18:13:15 -07:00
Zixaphir
5578c4c0f0 Release appchan x v2.8.8. 2014-01-30 14:21:19 -07:00
Zixaphir
5a5658bc60 Fix #557, Fix #554 2014-01-28 01:51:24 -07:00
Zixaphir
7930db0c81 Fix #534 2014-01-28 01:37:10 -07:00
Zixaphir
f4c8ebd233 Fix cursor in settings 2014-01-28 01:34:31 -07:00
Zixaphir
1b633a5517 Fix navbar spacing in settings 2014-01-28 01:32:59 -07:00