635 Commits

Author SHA1 Message Date
Zixaphir
4f50fd300d Infinite Scrolling
Conflicts:
	LICENSE
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
2013-10-19 19:45:35 -07:00
Zixaphir
9fb8ab50e1 MediaCrush embedding (the right way?) 2013-10-16 14:31:18 -07:00
Zixaphir
6f6766b9a0 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	html/General/Settings-section-Rice.html

Also renamed ColorUserIDs.coffee to IDColor.coffee to better handle
IDColor conflicts between Mayhem's repo and ours
2013-10-16 13:53:47 -07:00
Zixaphir
078869679b ThreadUpdater 2013-10-13 17:32:45 -07:00
Zixaphir
d2af181dea I removed autoUpdate 2013-10-13 14:48:43 -07:00
Zixaphir
1c9db7536d Restore ThreadUpdater.count() 2013-10-13 14:44:09 -07:00
Zixaphir
0415de74c1 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/html/Build/post.html
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
2013-10-13 14:29:52 -07:00
Zixaphir
38010c0b26 A couple of small things 2013-10-13 13:57:36 -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
seaweedchan
26a0c27ac3 Release 4chan X v1.2.41. 2013-10-03 16:49:16 -07:00
seaweedchan
6cab2cfca7 Fix #194 2013-10-03 16:47:45 -07:00
Zixaphir
0935464e05 Just in case 2013-09-24 15:08:38 -07:00
Zixaphir
d2ae42798a Fix seaweedchan/4chan-x#172, fix seaweedchan/4chan-x#190 2013-09-24 15:03:35 -07:00
Zixaphir
5b87c17e69 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/Archive/Redirect.coffee
2013-09-24 14:33:21 -07:00
seaweedchan
c6d5c0c463 Release 4chan X v1.2.40. 2013-09-22 04:45:33 -07:00
seaweedchan
93589e80ef Close #187 2013-09-22 04:40:37 -07:00
seaweedchan
6d4da42eb2 Merge Mayhem X 2013-09-22 03:57:03 -07:00
Jordan Bates
37fde17277 Build and changelog 2013-09-21 10:12:25 -07:00
Zixaphir
847078db53 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	json/archives.json
	package.json
	src/Filtering/Anonymize.coffee
	src/General/Config.coffee
	src/General/lib/post.class
	src/Linkification/Linkify.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
2013-09-20 05:45:04 -07:00
Zixaphir
8ba58ee12e Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
2013-09-20 04:45:46 -07:00
Jordan Bates
4ee4856a78 Release 4chan X v1.2.39. 2013-09-19 11:30:50 -07:00
Jordan Bates
2a1368fb80 Fix #185 and #186 2013-09-19 11:28:22 -07:00
Jordan Bates
871dd7582b Release 4chan X v1.2.38. 2013-09-19 07:38:43 -07:00
Jordan Bates
56387a7162 Fix type and build 2013-09-19 07:30:42 -07:00
Jordan Bates
decfb32948 Release 4chan X v1.2.37. 2013-09-12 16:38:59 -07:00
Jordan Bates
85afe58c62 Close #172 2013-09-12 16:37:00 -07:00
Jordan Bates
dde6658610 Close #168 2013-09-12 16:22:07 -07:00
Jordan Bates
ba53df6d22 Close #179 2013-09-12 16:19:43 -07:00
Jordan Bates
0cc8d1aef4 Fix file accidentally renaming, from Mayhem 2013-09-12 16:12:15 -07:00
Zixaphir
720606d2e2 Trick thread updater into allowing 1 second
PROTIP: minimum seconds are now techically two, but it'll still
display one. Anyone pissed about this needs to get a life.
2013-09-03 21:41:00 -07:00
Zixaphir
c7d2021895 Place remove spoilers after Linkify 2013-09-03 17:27:18 -07:00
Zixaphir
6ef4beb3e6 Fix Gallery "fit height" in Chrom* 2013-09-03 16:11:25 -07:00
Zixaphir
ba2ecd8237 Try to fix thread updater. 2013-09-03 15:53:06 -07:00
Zixaphir
47bdc73f4c Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	css/style.css
	src/Images/ImageExpand.coffee
	src/Linkification/Linkify.coffee
	src/Monitoring/ThreadUpdater.coffee
2013-08-30 18:15:47 -07:00
Jordan Bates
bc0f30612c Release 4chan X v1.2.36. 2013-08-26 21:04:35 -07:00
Jordan Bates
e44480c0c6 This seems redundant now 2013-08-26 20:48:50 -07:00
Jordan Bates
d30ed0a8ec For realz fix #164 2013-08-26 20:46:23 -07:00
Jordan Bates
5ae3e9e775 Fix #166 2013-08-25 17:20:59 -07:00
Jordan Bates
a62323915d Gallery tweaks
Also fix hide thumbnails
2013-08-25 17:12:00 -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
seaweedchan
5eb576d5f0 Fix #164 2013-08-24 23:36:07 -07:00
Zixaphir
c6b3f0b9b6 Focus a focusable element instead of trying to focus the image 2013-08-24 22:23:07 -07:00
Zixaphir
75e54949ae Restore the double-border on .gal-next IF thumbnails aren't hidden 2013-08-24 22:20:39 -07:00
Zixaphir
209154d905 Add some scrolling to the Thumbnail bar. 2013-08-24 22:19:30 -07:00
Zixaphir
f07a0a1694 Gallery.thumbs > Gallery.nodes.thumbs 2013-08-24 14:04:50 -07:00
Zixaphir
50416a0aab Cleanup 2013-08-24 13:10:03 -07:00
Zixaphir
c4fdaea615 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	css/style.css
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/lib/post.class
	src/Posting/QuickReply.coffee
2013-08-24 13:08:23 -07:00