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

450 Commits

Author SHA1 Message Date
Zixaphir
a2cacec59a Fix header autohide not showing on hover. 2014-04-06 20:33:01 -07:00
ccd0
0f38b9c467 Revert "css fix" 
This reverts commit 80b2eae41b62249f728bbdbdcacf649c2620e82b.

Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/style.css
 2014-04-06 20:10:35 -07:00
ccd0
0f770459c0 get new hover working in catalog 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/UI.coffee
	src/Images/ImageHover.coffee
 2014-04-06 16:06:11 -07:00
ccd0
74ef633fd7 better approach to hover css 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-06 16:04:36 -07:00
ccd0
80b2eae41b css fix 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-04-06 16:03:03 -07:00
ccd0
e1c9330250 get new hover working in catalog 2014-04-05 21:59:29 -07:00
ccd0
904af13063 better approach to hover css 2014-04-05 20:11:38 -07:00
ccd0
f88883887a css fix 2014-04-05 18:46:18 -07:00
Zixaphir
453ebe7e74 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
 2014-04-04 20:28:21 -07:00
Zixaphir
f6353729eb Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	package.json
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/FileInfo.coffee
	src/Posting/QR.coffee
 2014-04-04 20:24:12 -07:00
Zixaphir
f6898b8c03 Change some things around 2014-04-04 17:05:53 -07:00
Zixaphir
276a08d6e6 iHover is now a class 2014-04-04 16:15:07 -07:00
Zixaphir
8536ae3d37 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
 2014-04-04 16:12:31 -07:00
Zixaphir
4b28626410 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Images/ImageHover.coffee
	src/Posting/QR.coffee
 2014-04-04 16:10:07 -07:00
Zixaphir
6dcbb80070 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/updates.xml
	latest.js
	package.json
 2014-04-04 16:01:06 -07:00
Zixaphir
e4c395a7cd Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/Images/ImageExpand.coffee
 2014-04-04 15:41:15 -07:00
ccd0
26576b4420 video hover 2014-04-04 15:09:56 -07:00
ccd0
03c25ee34a add video expansion 2014-04-04 11:56:10 -07:00
Zixaphir
4d46c17073 Merge branch 'vampiric' 2014-04-03 15:33:39 -07:00
Zixaphir
b662cf2366 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/css/style.css
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
 2014-04-03 15:19:41 -07:00
Zixaphir
46478eb4d0 Merge branch 'duckness' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Linkification/Linkify.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
 2014-04-03 14:52:55 -07:00
Brandon
d9ea888d6f centering tab on slideup 2014-04-02 21:09:22 -07:00
Brandon
3d4e0338fe Zixa making fun of me 2014-04-02 20:58:46 -07:00
Brandon
541c8270ea More magic happens to the tabbed slideup 2014-04-02 20:52:12 -07:00
Brandon
dd8ba9f6b1 slideup fixup 2014-04-02 20:49:25 -07:00
Brandon
fd840d822c QR Slideup and Tabbed Slideup 
* upstream/master:
  move that where it belongs
  fix uploading swfs on /f/
  Release appchan x v2.9.10.
  Release 4chan X v3.19.5.
  Fix captchas, again. #1531
  Lets just build that so that we don't have to do so many logic checks
  Lets pretend we're smarter than we really are!

Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-04-02 20:12:35 -07:00
ccd0
4f260137f1 embed direct video links 2014-03-25 00:50:41 -07:00
Zixaphir
53db0118a3 Compact File Text 2014-03-23 18:41:26 -07:00
Zixaphir
fe7d37196f Merge branch 'v3' 
Also add Backlink Icons from OneeChan

Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-23 18:25:34 -07:00
Zixaphir
6e03bb150e Due to popular request, restore the catalog button. 2014-03-14 18:59:05 -07:00
Zixaphir
f903abd165 Merge branch 'v3' 
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-14 17:09:32 -07:00
Zixaphir
be4be5a94b Fix post fetching 2014-03-14 17:08:00 -07:00
Zixaphir
e459069ae6 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Miscellaneous/InfiniScroll.coffee
	src/Posting/QR.coffee
 2014-03-13 18:12:44 -07:00
Zixaphir
60b3d447c5 Allow searching from URL bar without refreshing the page (add #s=search) 
Reduce loops. Because we build threads in a loop, we can build replies
as we're building threads.

Go us.
 2014-03-13 13:25:04 -07:00
Zixaphir
cccd33759a Merge branch 'master' of git://github.com/vampiricwulf/appchan-x 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-10 14:45:09 -07:00
Zixaphir
f685dfe750 Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/css/style.css
 2014-03-10 12:49:26 -07:00
Zixaphir
5db027356e Fix autoscroll. 
I... uh, was dumb. Yeah.
 2014-03-10 12:45:36 -07:00
Zixaphir
6b712a5c0d Fix quote highlighting. 2014-03-10 12:17:43 -07:00
Zixaphir
a821a01fbe Make the return button work on Catalog view. 2014-03-10 08:04:24 -07:00
Zixaphir
32e5fbaa1a Small shortcuts bar height change. 
I figured out how to align from the bottom of the shortcuts bar,
so being able to move it to the bottom of the page might be coming
soon.
 2014-03-08 18:01:22 -07:00
Zixaphir
3f3fbfdc7f No, that's why Oneechan themes wouldn't import 
Also, fix Vertical Icons causing stats to be in the wrong spot.
 2014-03-08 17:54:18 -07:00
Zixaphir
19cd95cf78 Get rid of more Catalog stuff 2014-03-07 17:12:43 -07:00
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
b487624203 Seems I figured out where the switcheroo happened... 2014-03-06 22:43:34 -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
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