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

1169 Commits

Author SHA1 Message Date
Zixaphir
c5d0544316 Merge branch 'v3' 2014-03-08 16:36:02 -07:00
Zixaphir
1729350b26 Yes, lets use a dynamic href(=../) for a race-condition. 
Thanks, I love generating bad URLs.
 2014-03-08 16:35:18 -07:00
Zixaphir
093dfd169f Merge branch 'v3' 2014-03-08 16:25:32 -07:00
Zixaphir
c3a71e0ba3 >$.ready 2014-03-08 16:25:18 -07:00
Zixaphir
d4d4604e4a Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
 2014-03-08 16:18:59 -07:00
Zixaphir
cf1a4c1cc4 Phase out vanilla catalog 2014-03-08 16:14:16 -07:00
Zixaphir
072eb92e14 Merge branch 'v3' 2014-03-07 18:57:19 -07:00
Zixaphir
e4c8bd7ee6 Fix Get.threadExcerpt 2014-03-07 18:57:00 -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
ec7ec57b93 Fix external-text:"","" 2014-03-06 23:02:49 -07:00
Zixaphir
b487624203 Seems I figured out where the switcheroo happened... 2014-03-06 22:43:34 -07:00
Zixaphir
c7e5833dc9 Remove more references to the non-existent "catalog" view 2014-03-06 22:36:42 -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
Zixaphir
3237416133 Really though, what did that ever accomplish? Why did I do that? 2014-03-06 11:01:10 -07:00
Zixaphir
1d56914bcb Implement a silly breadcrumb for JSON Navigation 2014-03-06 09:49:36 -07: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
5ec17d3477 Fix an oopsie 2014-03-03 12:53:01 -07:00
Zixaphir
7c28da181b Fix ExpandThread without JSON Navigation 2014-03-03 12:41:26 -07:00
Zixaphir
b7585d9cd4 Lets abandon nesting 2014-03-03 02:37:31 -07:00
Zixaphir
2814818e9b Let's just wrap this all up into some nice, nested loops 2014-03-03 02:32:29 -07:00
Zixaphir
53258c59ae Reduce reduce. 2014-03-03 02:18:37 -07:00
Zixaphir
393f909d1e Reflow Navigate.parse 2014-03-03 01:02:31 -07:00
Zixaphir
d251177641 Fix navigating between threads via quote hashes 2014-03-03 00:32:27 -07:00
Zixaphir
052f491191 Add missing files. 2014-03-03 00:05:42 -07:00
Zixaphir
6760d4b948 Fix some issues causing Navigation functions to fail. 2014-03-03 00:03:55 -07:00
Zixaphir
7677f6bb35 Forgot an if. 2014-03-02 23:23:28 -07:00
Zixaphir
7a7a7facf7 Reflow a ton of navigate and index shit to fix broken shit 2014-03-02 21:04:14 -07:00
Zixaphir
e451410ef1 Small reflow to QuoteBacklink I. 
I don't like concatenating for temporary data.
 2014-03-02 19:45:54 -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
5a1bebf14d Merge branch 'master' of https://github.com/Spittie/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Posting/QR.coffee
 2014-03-01 14:53:36 -07:00
Zixaphir
a0c24fd06d Fix some stupid threadupdater issues, more navigate from catalog js 2014-03-01 14:46:37 -07:00
Kabir Sala
2309634930 Forget image 2014-03-01 18:59:46 +01: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
553a5a9133 Merge branch 'master' of https://github.com/Spittie/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/Index.coffee
	src/Posting/QR.coffee
 2014-02-28 19:37:26 -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
811e3ccaf3 Use our implementation of Navigating between boards 
Our custom navigation should now behave similar to Mayhem's, but
with JSON.
 2014-02-28 18:56:02 -07:00
Zixaphir
5a76a9109c Cache boards.json 2014-02-28 18:29:52 -07:00
Zixaphir
b4d28414df Fix OPs being built twice 2014-02-28 16:27:54 -07:00
Zixaphir
6ba92efcd4 Start working on fixing things after the last merge 2014-02-28 14:48:24 -07:00
Mayhem
59f2ca6a51 rm as many id attributes in posts as possible. 
Add root.dataset.fullID, simplify Get.postFromRoot().
Also figured Menu.toggle() could be simplified since stub of threads do not exist anymore.
 2014-02-27 19:02:32 +01:00