61 Commits

Author SHA1 Message Date
Zixaphir
4ff134e060 Gallery fix 2014-07-28 04:18:43 -07:00
Zixaphir
5c41014b1a Gallery improvements: now loops and image count fixed. 2014-07-17 23:43:35 -07:00
Zixaphir
e96354bc3e Implement #673 2014-07-17 19:19:48 -07:00
Zixaphir
64c9c139c1 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/Images/FappeTyme.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
2014-06-22 07:13:41 -07:00
Zixaphir
f103fd0301 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Archive/archives.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.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.post.coffee
2014-06-22 07:04:25 -07:00
Zixaphir
9d3ad61925 Merge branch 'v3'
Conflicts:
	builds/appchan-x.user.js
	builds/crx/script.js
2014-05-03 06:29:56 -07:00
Zixaphir
7375484693 Some misses 2014-05-03 06:27:49 -07:00
Zixaphir
c04c83f915 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	README.md
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/css/font-awesome.css
	src/General/html/Features/Index-navlinks.html
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadStats.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Theming/Banner.coffee
2014-05-03 06:20:04 -07:00
Zixaphir
523d6bd9c4 Merge branch 'ccd0' into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/General/Build.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Navigate.coffee
	src/General/css/style.css
	src/General/html/Build/post.html
	src/General/html/Features/Index-navlinks.html
	src/General/lib/post.class
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Images/ImageHover.coffee
	src/Miscellaneous/Banner.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.post.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/Quotify.coffee
2014-05-03 02:03:35 -07:00
ccd0
a452b732fd change res -> thread in JSON API URLs 2014-04-13 01:46:18 -07:00
ccd0
814b64b31c update URLs to 4cdn.org 2014-04-12 22:37:27 -07:00
ccd0
9acdd4bd85 tolerate new image links 2014-04-12 22:14:35 -07:00
Zixaphir
ea47aefd93 Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	CONTRIBUTING.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Settings.html
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/ThreadWatcher.coffee
2014-04-11 00:29:52 -07:00
Zixaphir
586a048d6e Enable video controls! 2014-04-10 23:40:18 -07:00
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
ccd0
2af481a68e fix gallery 2014-04-08 20:04:58 -07:00
Zixaphir
d9d2ceb9b1 Merge branch 'ccd0' into v3
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/Get.coffee
	src/Images/Gallery.coffee
2014-04-07 18:35:18 -07:00
ccd0
e69d6b2e7c gallery thumbnail shouldn't clone contracted image/video 2014-04-07 13:30:12 -07:00
Zixaphir
d2727c4054 Implement webm thumbnail replacement. 2014-04-07 10:33:52 -07:00
Zixaphir
13605179cd WebM Gallery Mode. 2014-04-06 22:40:16 -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
c7e5833dc9 Remove more references to the non-existent "catalog" view 2014-03-06 22:36:42 -07:00
Zixaphir
a9ff7e8d7e Fix Gallery menu-button 2014-02-16 04:40:35 -07:00
Zixaphir
1f49ef2212 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/html/Settings/Settings.html
	src/Miscellaneous/AnnouncementHiding.coffee
2014-01-26 11:40:50 -07:00
Zixaphir
b62d82bed0 Mayhem made responseType JSON default for any URL containing .json. 2014-01-24 14:48:39 -07:00
Jordan
26ee14e688 Update font-awesome 2014-01-08 23:33:52 -07:00
Zixaphir
996080cab9 Merge branch 'v3'
Conflicts:
	Gruntfile.coffee
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/Menu/Menu.coffee
	src/Posting/QR.coffee
2013-12-25 11:23:41 -07:00
Zixaphir
ae789f4ad8 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Index.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/Posting/QuickReply.coffee
2013-12-24 16:18:47 -07:00
Zixaphir
91233b8d61 remove [].contains. It was a bad idea.
I shouldn't be messing with stuff like this without a really good
reason for doing so, and the longer I thought about it, the more
it occurred to me that I didn't have one.
2013-12-24 14:41:21 -07:00
Zixaphir
3ad1c6040c Redo FontAwesome stuff, I guess. 2013-11-23 13:23:36 -07:00
Zixaphir
34140232fb Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/font-awesome.css
	src/General/lib/notice.class
	src/General/meta/metadata.js
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee

worksforme.png
2013-11-23 12:56:42 -07:00
Zixaphir
a3c1afa5cd Merge -- probably bugged until I sort out everything
that's actually changed. Honestly, all I wanted was the
4cdn changes, but any excuse to merge was good enough, I guess.

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	changelog-old
	css/style.css
	html/General/Settings.html
	html/Monitoring/ThreadUpdater.html
	html/Monitoring/ThreadWatcher.html
	html/Posting/QR.html
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/post.class
	src/General/meta/manifest.json
	src/Images/ImageExpand.coffee
	src/Meta/banner.js
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Miscellaneous/Nav.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
2013-11-22 17:25:06 -07:00
Zixaphir
904316e4e0 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
2013-10-13 14:42:58 -07:00
Zixaphir
91cedb3b89 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	html/General/Settings-section-Rice.html
	img/changelog/3.9.0/0.png
	package.json
	src/Images/AutoGIF.coffee
	src/Images/RevealSpoilers.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/IDColor.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteInline.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee
2013-10-13 13:53:38 -07:00
Zixaphir
2efd32a0a6 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css
2013-08-30 19:35:10 -07:00
Jordan Bates
a62323915d Gallery tweaks
Also fix hide thumbnails
2013-08-25 17:12:00 -07:00
Zixaphir
b9ab19974b Clean reserved words 2013-08-25 11:29:44 -07:00
Zixaphir
1450e61369 Merge branch 'v3'
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/style.css
	src/Images/Gallery.coffee
2013-08-25 10:11:46 -07:00
Zixaphir
4435b84f3f Sometimes, I'm dumb 2013-08-25 09:13:05 -07:00
Zixaphir
9353bcd50d Separate Gallery and Image Expansion fit width / height 2013-08-25 08:47:09 -07:00
Zixaphir
5c43ffb272 Get some rudimentary error handling setup in the gallery
This is mostly just Mayhem's ImageExpand error code, refactored
for the context of the gallery.
2013-08-25 08:31:34 -07:00
seaweedchan
6598b5a45e Merge Zixaphir X 2013-08-25 01:15:47 -07:00
Zixaphir
c6b3f0b9b6 Focus a focusable element instead of trying to focus the image 2013-08-24 22:23:07 -07:00
Zixaphir
209154d905 Add some scrolling to the Thumbnail bar. 2013-08-24 22:19:30 -07:00
Zixaphir
7a7d39c171 Merge branch 'v3' 2013-08-24 14:05:32 -07:00
Zixaphir
f07a0a1694 Gallery.thumbs > Gallery.nodes.thumbs 2013-08-24 14:04:50 -07:00
Zixaphir
d4a3bc8a17 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/General/css/font-awesome.css
	src/Images/FappeTyme.coffee
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee
2013-08-24 13:57:27 -07:00
Zixaphir
8c1ac1710a Gallery stuff. 2013-08-23 14:37:20 -07:00