254 Commits

Author SHA1 Message Date
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
407fdf745e ::before 2013-11-23 12:23:37 -07:00
Zixaphir
9f7dda70c1 Fix menu's CSS 2013-11-23 11:52:25 -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
6d9b9cef8f Fix #470
I swear I fixed this... already?
2013-10-14 08:29:29 -07:00
Zixaphir
2a571fdecf Fix issues with header bar and sidebar width 2013-10-13 15:02:03 -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
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
7812001d96 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	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/css/style.css
	src/Posting/QuickReply.coffee
2013-09-24 14:46:24 -07:00
seaweedchan
6d4da42eb2 Merge Mayhem X 2013-09-22 03:57:03 -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
ba53df6d22 Close #179 2013-09-12 16:19:43 -07:00
Zixaphir
09936f3d6c Adapt silhouette code to generate silhouette Mascots 2013-09-04 15:11:55 -07:00
Zixaphir
98b07e177c One day, I'll just rewrite the whole mascot code
And then I'll just release it as its own script
And then I'll break Appchan X into script modules
And then, I'll look back
And realize I've come full circle and returned to `ya4cie`
<3 @aeosynth
2013-09-04 14:27:22 -07:00
Zixaphir
6ef4beb3e6 Fix Gallery "fit height" in Chrom* 2013-09-03 16:11:25 -07:00
Zixaphir
8978f461b7 Lets not remove slideout navigation from the DOM if it's hidden 2013-08-31 10:16:11 -07:00
Jordan Bates
a62323915d Gallery tweaks
Also fix hide thumbnails
2013-08-25 17:12:00 -07:00
Zixaphir
2cb40a7f75 Add flex to our QR 2013-08-25 14:20:51 -07:00
Zixaphir
e6de614e14 Redo posts as flex
No more clearfix, no more "overflow: hidden", no more bullshit.
2013-08-25 13:48:05 -07:00
Zixaphir
ace2f6384f Release appchan x v2.3.8. 2013-08-25 12:59:16 -07:00
Zixaphir
82d43423c5 Fix #440 2013-08-25 10:57:41 -07:00
Zixaphir
5201395246 Fix slideout threadwatcher, navigation, and PSA hover 2013-08-25 10:23:29 -07:00
Zixaphir
85f226d3d4 CSS 2013-08-25 10:08:47 -07:00
Zixaphir
9353bcd50d Separate Gallery and Image Expansion fit width / height 2013-08-25 08:47:09 -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
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
c31e9cde8d Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/css/style.css
2013-08-24 12:20:01 -07:00
Zixaphir
a1fe4b50b5 Oversight 2013-08-24 11:32:14 -07:00
Zixaphir
8c1ac1710a Gallery stuff. 2013-08-23 14:37:20 -07:00
Jordan Bates
1cb46eef80 Redo highlight color 2013-08-23 10:09:56 -07:00
Jordan Bates
fafc46952f Gallery aesthetics 2013-08-23 09:43:52 -07:00
Jordan Bates
7c1bd2dbd3 Fit height 2013-08-23 08:37:26 -07:00
seaweedchan
b51755a4f9 Some more gallery tweaks 2013-08-23 03:14:42 -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
aabe78984d Shrink Gallery fonts 2013-08-22 10:44:49 -07:00
Zixaphir
d1568b60f4 typo 2013-08-21 13:13:21 -07:00
Zixaphir
fee1785104 Finish up Gallery for the time being 2013-08-21 13:04:40 -07:00
Zixaphir
5af3407eda Fix Style.padding 2013-08-21 11:40:06 -07:00
Zixaphir
e80797a0fb Separate icons and "stats" in the shortcuts element 2013-08-21 11:26:48 -07:00
Zixaphir
fa44526c54 Rice gallery a little harder
Focus frame on open()
2013-08-21 07:13:58 -07:00
Zixaphir
8fde4ef520 Accidentally saved all 2013-08-20 09:05:25 -07:00
Zixaphir
3e2bfee617 Pretty much finish up the Gallery 2013-08-20 09:04:56 -07:00
Zixaphir
54b373c688 Small Gallery. I'm not sure where I'm going with it yet. 2013-08-20 04:46:04 -07:00
Zixaphir
1cf8b0fe9e Werk Tyme 2013-08-20 01:11:32 -07:00
Zixaphir
f1dca28678 No longer necessary 2013-08-20 00:57:33 -07:00
Zixaphir
3c0c478ded Some touchups 2013-08-20 00:56:18 -07:00
Zixaphir
c37971cc54 Remove old files 2013-08-20 00:30:42 -07:00
Zixaphir
7d626b9cb8 Get "slideout" UI working. 2013-08-20 00:20:29 -07:00
Zixaphir
1facbe7dc1 Get Flex actually working 2013-08-19 09:06:31 -07:00