142 Commits

Author SHA1 Message Date
ccd0
60f869d818 add .webm, .pdf support to gallery 2014-04-09 02:55:32 -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
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
26576b4420 video hover 2014-04-04 15:09:56 -07:00
ccd0
03c25ee34a add video expansion 2014-04-04 11:56:10 -07:00
ccd0
4f260137f1 embed direct video links 2014-03-25 00:50:41 -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
Zixaphir
a44e75862f Merge branch 'v3' into json
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
2014-01-10 17:18:23 -07:00
Jordan
bc202ff700 Chrome fixes
Close #230
2014-01-10 08:58:39 -07:00
Jordan
64b13ef184 Board title and announcement tweaks
Close #232, close #233
2014-01-10 08:34:56 -07:00
Jordan
52a287f11f Announcement hiding button in font awesome
Close #231
2014-01-10 07:44:54 -07:00
Zixaphir
890277f296 Update QR depending on state. 2014-01-09 23:20:38 -07:00
Jordan
28d9e88856 Leave this :not in here 2014-01-09 20:24:02 -07:00
Jordan
9a66c0286c Restyle QR link
Close #224
2014-01-09 20:22:08 -07:00
Jordan
6e5e4cfb45 Rgba instead of opacity
Close #228
2014-01-09 18:18:38 -07:00
Jordan
37accb230d Touch up menus and .current border
Close #227, close #229
2014-01-09 18:12:30 -07:00
Jordan
436e138895 Merge Zixaphir X 2014-01-09 17:42:57 -07:00
Zixaphir
ab8607710b Switch document class names when switching between views 2014-01-09 14:49:05 -07:00
Zixaphir
9478dabdad Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	package.json
	src/General/css/font-awesome.css
2014-01-09 10:12:28 -07:00
Jordan
5682df5a2a Tweak the clear search button a bit 2014-01-09 03:33:47 -07:00
Jordan
526783d273 Font-awesome hide buttons, close #226 2014-01-09 03:05:46 -07:00
Jordan
feca837cbc Restyle header a bit, close #220 2014-01-09 01:55:52 -07:00
Jordan
f217d94299 Menu button changes, close #223 2014-01-09 00:23:43 -07:00
Jordan
8575c0ce87 Redundancy 2014-01-08 23:34:52 -07:00
Jordan
26ee14e688 Update font-awesome 2014-01-08 23:33:52 -07:00
Jordan
8419b7c88b Merge Zixaphir X, close #221 2014-01-08 20:55:13 -07:00
Zixaphir
63b09cb803 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	package.json
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/css/font-awesome.css
	src/General/lib/databoard.class
	src/Miscellaneous/ExpandThread.coffee
	src/Monitoring/ThreadUpdater.coffee
2014-01-07 20:28:47 -07:00
Jordan
7c9d3b7fe1 Remove annoying moot text that gets added when adblocking ads 2014-01-07 02:48:37 -07:00
Jordan
4d3195bbb9 Update font-awesome 2014-01-07 02:00:47 -07:00
Zixaphir
5d6b357135 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/lib/post.class
2013-12-18 12:21:43 -07:00
Zixaphir
c36d62d5ce Cleanup and fix remaining issues from seaweedchan/4chan-x#212 2013-12-18 12:15:13 -07:00
Zixaphir
a719bbde38 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Config.coffee
2013-12-16 12:56:09 -07:00
Zixaphir
b396ef982f Fix a couple more classes 2013-12-16 12:25:39 -07:00
Zixaphir
8b14d8bd8f Fix header positions 2013-12-06 17:22:47 -07:00