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

385 Commits

Author SHA1 Message Date
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
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
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
Zixaphir
63b0f2a9fa Wrong CSS rules in Yotsuba CSS 
Not sure how that happened...
 2014-03-03 14:10:07 -07:00
Zixaphir
a4ead91d65 Remove some accidental cruft left from incorrectly merging 
Fix some QR bugs, remove references to the 'catalog' g.VIEW
And actually put in QuoteMarkers
 2014-03-02 18:59:35 -07:00
Zixaphir
19800bd0d9 Hide Index UI in thread view. 2014-03-01 15:07:26 -07:00
Zixaphir
db5cccc70f Merge branch 'mayhem' into v3 (Bugtesting time... yey... ;__;) 
Conflicts:
	css/burichan.css
	css/futaba.css
	css/photon.css
	css/tomorrow.css
	css/yotsuba-b.css
	css/yotsuba.css
	html/General/Settings-section-Main.html
	html/General/Settings.html
	src/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Settings.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadUpdater.coffee
 2014-02-28 19:59:04 -07:00
Zixaphir
0d7f5ab78c Lets use our "dialog" class for shit we don't need to fuck around with 2014-02-28 19:22:38 -07:00
Zixaphir
6c4e97b388 Restore CSS I accidentally deleted 
This is Seaweed's stuff, and he kinda-sorta originally wrote the
stylesheets for a lot of these styles for 4chan (not 4chan X)
so it's probably best we leave them to his vision.
 2014-02-28 19:12:13 -07:00
Zixaphir
6ba92efcd4 Start working on fixing things after the last merge 2014-02-28 14:48:24 -07:00
Zixaphir
9d95bbea35 Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet) 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	css/burichan.css
	css/futaba.css
	css/photon.css
	css/style.css
	css/tomorrow.css
	css/yotsuba-b.css
	css/yotsuba.css
	html/General/Index-navlinks.html
	html/General/Settings-section-Rice.html
	html/General/Settings.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/Recursive.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/lib/$.coffee
	src/General/lib/databoard.class
	src/General/lib/post.class
	src/General/lib/thread.class
	src/Images/ImageExpand.coffee
	src/Images/RevealSpoilers.coffee
	src/Linkification/Linkify.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/IDColor.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.cooldown.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/QuoteCT.coffee
	src/Quotelinks/QuoteOP.coffee
	src/Quotelinks/QuoteStrikeThrough.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee
 2014-02-23 14:04:45 -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
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
e4a781cea6 basic /f/ fixup css 2014-02-16 12:33:39 -08:00