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

169 Commits

Author SHA1 Message Date
Zixaphir
88b0b0b32f Gallery reflows. 2014-04-10 23:25:46 -07:00
Zixaphir
28eebe0183 Merge branch 'ccd0' into v3 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
 2014-04-10 23:08:43 -07:00
ccd0
60f869d818 add .webm, .pdf support to gallery 2014-04-09 02:55:32 -07:00
Zixaphir
d2727c4054 Implement webm thumbnail replacement. 2014-04-07 10:33:52 -07:00
Zixaphir
e286c247ea Merge branch 'ccd0' into v3 
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Images/ImageExpand.coffee
 2014-04-06 22:45:30 -07:00
Zixaphir
13605179cd WebM Gallery Mode. 2014-04-06 22:40:16 -07:00
ccd0
98514dd986 this should get width fitting working again 
hopefully it doesn't break anything else
 2014-04-06 21:38:44 -07:00
Zixaphir
824f4d3e78 Correctly this time, please 2014-04-06 21:03:29 -07:00
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
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
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
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
ccd0
4f260137f1 embed direct video links 2014-03-25 00:50:41 -07:00
Zixaphir
be4be5a94b Fix post fetching 2014-03-14 17:08:00 -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
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
b487624203 Seems I figured out where the switcheroo happened... 2014-03-06 22:43:34 -07: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
6dd0cac797 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/Archive/Redirect.coffee
	src/General/Header.coffee
	src/Monitoring/Favicon.coffee
 2014-02-16 01:00:41 -07:00
Kabir Sala
d8a168a549 More work on post from url 2014-02-11 23:37:52 +01:00
Kabir Sala
f0bd6b1b04 Start working on remote upload (Chrome-only so far) 2014-02-11 18:32:23 +01:00
Zixaphir
f133da454d Fix settings dialog, customize reset button 2014-01-22 12:24:30 -07:00
Zixaphir
b6749b91a5 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	css/style.css
	html/General/Settings-section-Main.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/thread.class
	src/Linkification/Linkify.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadStats.coffee
 2014-01-22 12:10:34 -07:00
Zixaphir
4da7bd827d Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-01-13 13:11:19 -07:00
Zixaphir
d41448a403 Work around a small issue 
causing the space after a quotelink to disappear after inlining a
post and uninlining it.

Seriously.
 2014-01-13 00:23:40 -07:00
Zixaphir
561ca0be64 Typo 2014-01-13 00:12:34 -07:00
Zixaphir
971b7d971e Better QuoteInline process 2014-01-13 00:09:43 -07:00
Zixaphir
3f849a95d8 Use brackets-wrap 
This also should make things easier for people who use userstyles
who would want to hide brackets or otherwise change their content
without resorting to weird hacks, like changing the font size of
the parent element to 0 and making text invisible, and then
reverting it in child elements.
 2014-01-12 23:49:25 -07:00
Jordan
d914619e69 Revert a bit of menu code for #240 2014-01-12 19:32:50 -07:00
Zixaphir
1b368e4edc Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/General/Index.coffee
 2014-01-12 14:52:47 -07:00
Jordan
a1e3793cb5 Make a few changes specific to the fixed header 
Close #239
 2014-01-11 22:18:03 -07:00
Zixaphir
3a76018fe4 Add return buttons and the like to the Index.navLinks 
We need to generate these now because the Index features always
will remove them.
 2014-01-11 00:04:44 -07:00