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

92 Commits

Author SHA1 Message Date
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
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
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
Jordan Bates
382943a266 Cooldown fix, from Mayhem 2013-12-06 17:09:57 -07:00
Jordan Bates
16e2afa916 Update for moot's markup change, close #213 2013-12-06 16:57:35 -07:00
Zixaphir
9f7dda70c1 Fix menu's CSS 2013-11-23 11:52:25 -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
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
6ef4beb3e6 Fix Gallery "fit height" in Chrom* 2013-09-03 16:11:25 -07:00
Jordan Bates
a62323915d Gallery tweaks 
Also fix hide thumbnails
 2013-08-25 17:12:00 -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
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
ce78a9d403 We're just going to use the CSS we want, not the CSS provided. 2013-08-18 04:06:39 -07:00
seaweedchan
1fb2897baa Some shortcut icon tweaks 2013-08-18 03:42:25 -07:00
seaweedchan
b99bae6843 Make background removal important 2013-08-18 01:53:02 -07:00
seaweedchan
5d763b44f1 QR filename editing tweaks 2013-08-18 01:51:07 -07:00
Zixaphir
decf5e4fab Apply icons to all shortcuts, really. 
@seaweedchan: This seems more your forte than mine.
 2013-08-17 21:11:00 -07:00
Zixaphir
d15f8ee728 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	css/style.css
	html/Posting/QR.html
	img/changelog/3.2.0/0.png
	package.json
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Notice.coffee
	src/General/Notification.coffee
	src/General/Settings.coffee
	src/General/img/icon.gif
	src/General/lib/notification.class
	src/Monitoring/Favicon.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteOP.coffee
 2013-08-17 20:33:48 -07:00
seaweedchan
7f52115b38 Banner changing and title editing 
from Appchan X
 2013-08-16 01:52:28 -07:00
seaweedchan
40a0fd3d07 Undo watcher class change 2013-08-14 03:31:32 -07:00
seaweedchan
1b2b859ca2 Whoops 2013-08-14 02:44:17 -07:00
seaweedchan
6b98f8acb4 Make classes consistent with Mayhem X 2013-08-14 02:41:07 -07:00
seaweedchan
e75ad405bf Revert class name changes 2013-08-13 00:18:01 -07:00
seaweedchan
b9b4efae5e Merge in new thread watcher and change a few things 2013-08-13 00:03:29 -07:00
Zixaphir
ade7628838 css classes yo 2013-08-12 19:44:46 -07:00
Zixaphir
03821c1ac9 Add our toggleable features and such 2013-08-12 18:41:38 -07:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
Zixaphir
6ba8d9ae8c Keybind to scroll to posts quoting you. 2013-08-08 23:53:48 -07:00
Zixaphir
d2bcf840ff 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
	src/Archive/Redirect.coffee
 2013-07-21 08:43:58 -07:00
Zixaphir
582d067a10 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.js
	README.md
	changelog-old
	css/style.css
	html/Monitoring/ThreadStats.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Filter-guide.html
	src/General/lib/$.coffee
	src/General/lib/clone.class
	src/General/lib/post.class
	src/Images/ImageHover.coffee
	src/Menu/Menu.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/Quotify.coffee
 2013-07-21 08:39:40 -07:00
Jordan Bates
b3db117d71 Make pointer event removal more specific 2013-07-15 19:33:40 -07:00
Jordan Bates
d65fd4e376 No pointer events for scroll marker 2013-07-15 08:04:33 -07:00
Jordan Bates
edba273868 Remove CSS that forces full images onto own line 
Close #105
 2013-06-17 06:52:02 -07:00
Jordan Bates
f5a3c3abd0 Close #97 2013-06-14 07:24:01 -07:00
seaweedchan
f6d8ee29ae Close #102 2013-06-14 03:30:18 -07:00
Jordan Bates
4481b56851 Mayhem X 2013-05-27 06:13:40 -07:00