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

111 Commits

Author SHA1 Message Date
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
6dd2e60e9a Element.contains was not Array.contains, lol 2013-12-25 10:10:51 -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
16b650f26c Ads Please! 2013-12-16 18:49:25 -07:00
Zixaphir
57f7d899ec Some last FappeTyme/WerkTyme tweaks 2013-12-16 18:36:09 -07:00
Zixaphir
68bc40cc45 Merge branch 'v3' 
Conflicts:
	src/Images/FappeTyme.coffee
 2013-12-16 14:12:42 -07:00
Zixaphir
0033c5370f Don't make last minute changes without testing. ;__; 2013-12-16 14:11:15 -07:00
Zixaphir
e156cc8e9c Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/script.js
	src/General/Config.coffee
	src/Images/FappeTyme.coffee
	src/Linkification/Linkify.coffee
 2013-12-16 14:01:47 -07:00
Zixaphir
545a1f346f "Fix" Fappe/Werk Tyme and actually fix Werk Tyme. 2013-12-16 13:36:19 -07:00
Zixaphir
6c47fb300a Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/crx/script.js
	src/General/Header.coffee
 2013-12-06 17:20:48 -07:00
Zixaphir
adaa09aaaa Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Fix some issues with previous merge.

Conflicts:
	CHANGELOG.md
	package.json
	src/General/Header.coffee
	src/Linkification/Linkify.coffee
 2013-12-06 17:11:36 -07:00
Mayhem
3efffe8a6e Fix 4chan X for markup change. 2013-12-07 00:03:55 +01:00
Zixaphir
33c8bdc32d Release appchan x v2.6.1. 2013-11-27 17:04:13 -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
Mayhem
985afb2a1a Support 4cdn. 2013-11-21 23:11:02 +01:00
Mayhem
6975a766b9 Update font-awesome. 2013-11-07 22:34:41 +01:00
Mayhem
81a2b096a1 Introduce Header.{scrollToIfNeeded,getTopOf,getBottomOf}() and use them. 
4chan X - now with proper bottom header support.
 2013-11-03 01:27:23 +01:00
Mayhem
c2984275e5 Add index refresh shortcut in the header bar. 
Also fix lazy/lame implementation of Header.addShortcut()
 2013-11-02 19:21:04 +01:00
Mayhem
4ff5fd287a Update FontAwesome. 2013-10-23 21:13:10 +02: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
Mayhem
10e93091d7 {Post,Thread}::callbacks => {Post,Thread}.callbacks 2013-10-02 11:38:15 +02: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
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
Mayhem
455778f865 Fix image contraction not always moving us back to the post. 2013-08-28 20:32:58 +02: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
dc0b4d3d41 Keybinds, Werk Tyme, more Mayhem-X-like IDColor 2013-08-24 11:24:49 -07:00
Zixaphir
8c1ac1710a Gallery stuff. 2013-08-23 14:37:20 -07:00
seaweedchan
9a43535675 Some small gallery tweaks 2013-08-23 03:01:13 -07:00
Zixaphir
8e4d88eb16 Port Appchan's Gallery 2013-08-22 12:28:55 -07:00
Zixaphir
fee1785104 Finish up Gallery for the time being 2013-08-21 13:04:40 -07:00
Zixaphir
e80797a0fb Separate icons and "stats" in the shortcuts element 2013-08-21 11:26:48 -07:00
Zixaphir
943ec4d2f4 Fix Gallery.node 2013-08-21 07:45:42 -07:00
Zixaphir
fa44526c54 Rice gallery a little harder 
Focus frame on open()
 2013-08-21 07:13:58 -07:00
Zixaphir
19631dee68 Fix Gallery GIF animation 2013-08-21 04:47:39 -07:00
Zixaphir
c13b3731b7 Fix Gallery not rescrolling 2013-08-20 09:16:57 -07:00