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

417 Commits

Author SHA1 Message Date
Zixaphir
b6749b91a5 Merge branch 'mayhem' into v3 
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	css/style.css
	html/General/Settings-section-Main.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/thread.class
	src/Linkification/Linkify.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadStats.coffee
 2014-01-22 12:10:34 -07:00
Zixaphir
4da7bd827d Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-01-13 13:11:19 -07:00
Zixaphir
d41448a403 Work around a small issue 
causing the space after a quotelink to disappear after inlining a
post and uninlining it.

Seriously.
 2014-01-13 00:23:40 -07:00
Zixaphir
561ca0be64 Typo 2014-01-13 00:12:34 -07:00
Zixaphir
971b7d971e Better QuoteInline process 2014-01-13 00:09:43 -07:00
Zixaphir
3f849a95d8 Use brackets-wrap 
This also should make things easier for people who use userstyles
who would want to hide brackets or otherwise change their content
without resorting to weird hacks, like changing the font size of
the parent element to 0 and making text invisible, and then
reverting it in child elements.
 2014-01-12 23:49:25 -07:00
Jordan
d914619e69 Revert a bit of menu code for #240 2014-01-12 19:32:50 -07:00
Zixaphir
1b368e4edc Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/General/Index.coffee
 2014-01-12 14:52:47 -07:00
Jordan
a1e3793cb5 Make a few changes specific to the fixed header 
Close #239
 2014-01-11 22:18:03 -07:00
Zixaphir
3a76018fe4 Add return buttons and the like to the Index.navLinks 
We need to generate these now because the Index features always
will remove them.
 2014-01-11 00:04:44 -07:00
Zixaphir
a44e75862f Merge branch 'v3' into json 
Conflicts:
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
 2014-01-10 17:18:23 -07:00
Jordan
bc202ff700 Chrome fixes 
Close #230
 2014-01-10 08:58:39 -07:00
Jordan
64b13ef184 Board title and announcement tweaks 
Close #232, close #233
 2014-01-10 08:34:56 -07:00
Zixaphir
890277f296 Update QR depending on state. 2014-01-09 23:20:38 -07:00
Jordan
28d9e88856 Leave this :not in here 2014-01-09 20:24:02 -07:00
Jordan
9a66c0286c Restyle QR link 
Close #224
 2014-01-09 20:22:08 -07:00
Jordan
6e5e4cfb45 Rgba instead of opacity 
Close #228
 2014-01-09 18:18:38 -07:00
Jordan
37accb230d Touch up menus and .current border 
Close #227, close #229
 2014-01-09 18:12:30 -07:00
Zixaphir
ab8607710b Switch document class names when switching between views 2014-01-09 14:49:05 -07:00
Jordan
5682df5a2a Tweak the clear search button a bit 2014-01-09 03:33:47 -07:00
Jordan
526783d273 Font-awesome hide buttons, close #226 2014-01-09 03:05:46 -07:00
Jordan
feca837cbc Restyle header a bit, close #220 2014-01-09 01:55:52 -07:00
Jordan
f217d94299 Menu button changes, close #223 2014-01-09 00:23:43 -07:00
Jordan
8575c0ce87 Redundancy 2014-01-08 23:34:52 -07:00
Jordan
26ee14e688 Update font-awesome 2014-01-08 23:33:52 -07:00
Jordan
8419b7c88b Merge Zixaphir X, close #221 2014-01-08 20:55:13 -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