305 Commits

Author SHA1 Message Date
Zixaphir
e93a249e4b Redo mascot exporting. 2013-05-28 05:34:14 -07:00
Zixaphir
7809ca0fe3 Basically redo theme importing. 2013-05-28 05:15:58 -07:00
Zixaphir
1a2b663658 Fix highlighting 2013-05-27 18:29:16 -07:00
Zixaphir
9bd241552e Cut down on math 2013-05-27 17:29:32 -07:00
Jordan Bates
33c1d58d5f Merge Mayhem X 2013-05-27 16:14:36 -07:00
Zixaphir
00be284919 Small CSS fix to tabbed slideout 2013-05-27 14:42:13 -07:00
Zixaphir
334d0e9c44 Fix posts with inlined posts shrinking unnecessarily. 2013-05-27 14:29:07 -07:00
Zixaphir
ca4be499a3 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
2013-05-27 14:22:31 -07:00
Jordan Bates
4481b56851 Mayhem X 2013-05-27 06:13:40 -07:00
Jordan Bates
745e5bd197 Fire OpenSettings event on settings/section creation 2013-05-27 01:04:34 -07:00
Jordan Bates
55def8c027 Page Count in Stats option, #43 2013-05-27 00:25:56 -07:00
Mayhem
d69a2c3fc6 Serial comma. Close #1126 2013-05-26 14:43:00 +02:00
seaweedchan
2c087f1b8d Dont override arrow keys 2013-05-25 23:17:09 -07:00
Mayhem
121bd1834c Add page number in Thread Stats. Close #832 2013-05-26 01:06:01 +02:00
Jordan Bates
b6c132c493 Revert Zixaphir X, #87 2013-05-25 13:10:43 -07:00
seaweedchan
11730a4673 I dont want these changes
Main.coffee change created flashing of certain elements
2013-05-25 00:14:28 -07:00
Zixaphir
81bd621d0d Merge branch 'v3'
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Settings/Advanced.html
2013-05-23 15:51:51 -07:00
Zixaphir
974197afdf Yeah, I'm sick of this shit. Fixed. 2013-05-23 14:12:43 -07:00
Zixaphir
139e2f9768 hue hue hue hue
(image prefetching)
2013-05-23 13:09:11 -07:00
Zixaphir
d4abb2f320 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 2013-05-21 18:40:48 -07:00
Zixaphir
23f28b89ff CSS brackets spacing. 2013-05-21 18:00:01 -07:00
Mayhem
a2ac3d73e1 Fix building of deleted files. 2013-05-21 18:37:13 +02:00
Jordan Bates
55447378f1 Some people find the custom nav guide confusing 2013-05-20 17:17:45 -07:00
Zixaphir
913c447e80 Merge branch 'master' of github.com:zixaphir/appchan-x 2013-05-20 17:09:30 -07:00
Zixaphir
7ef6aa71fd Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	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
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
2013-05-20 17:06:30 -07:00
Zixaphir
dd4520fecf Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 2013-05-20 16:59:06 -07:00
Jordan Bates
902c08f807 Dont let deadlinks get stuck if problems loading 2013-05-20 16:28:02 -07:00
Jordan Bates
3d8dbb05d5 Missed this 2013-05-20 15:18:40 -07:00
Jordan Bates
d35932ba0f Mayhem X, update changelog 2013-05-20 15:13:06 -07:00
Jordan Bates
f4059e723d QR link fixes 2013-05-20 01:05:49 -07:00
Jordan Bates
75735aedf0 Advance on contract option, close #74 2013-05-19 21:24:21 -07:00
Mayhem
f87ba3f3e8 Differentiate between an original post and a clone in error reports. 2013-05-18 17:01:55 +02:00
Mayhem
afe98d2425 Errors will occur before we detect v2, make sure those don't get sent. 2013-05-18 16:49:31 +02:00
Mayhem
fbef2401b3 Actually let's try this fix instead. 2013-05-17 22:32:46 +02:00
Mayhem
fb699eac64 I'm still getting Object.keys called on non-object from here.
wtf
2013-05-17 22:26:19 +02:00
Mayhem
ff65a27034 Stop logging this.
It didn't reveal anything other than that #boardNavMobile is missing too.
2013-05-17 22:19:47 +02:00
Mayhem
f00b060f70 Fix #1109.
Just how fucking difficult is it to integrate the catalog correctly?
/slap @desuwa
2013-05-17 22:14:05 +02:00
Mayhem
627ab32b59 Don't log errors coming from v2 users. 2013-05-17 22:05:01 +02:00
Mayhem
45de71ad41 Also block /fk/. 2013-05-17 22:03:01 +02:00
Mayhem
371cf05b68 Set the g's even sooner. 2013-05-17 22:02:16 +02:00
Jordan Bates
3b18a2792a Add this back in 2013-05-16 11:23:59 -07:00
Jordan Bates
0adfd27112 This is also redundant it seems 2013-05-15 12:05:26 -07:00
Jordan Bates
6bdc8e59db Revert Mayhem's initStyle changes
Oddly enough, though he did this to fix the wrong
color scheme showing, in this fork it CREATED
that bug.
2013-05-15 12:01:14 -07:00
Jordan Bates
b75d47e83b CONTRIBUTING -> README 2013-05-15 11:26:06 -07:00
Jordan Bates
13957f0ad2 Lets make things better for Tomorrow users 2013-05-15 09:57:55 -07:00
Zixaphir
ffaf95ef68 Indent Replies 2013-05-15 09:23:13 -07:00
Zixaphir
70d1d758ec Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
2013-05-15 09:00:09 -07:00
Zixaphir
e4bdad43c7 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3 2013-05-15 08:41:47 -07:00
Jordan Bates
f91702b984 Option affects lack of captcha warning as well 2013-05-15 06:11:01 -07:00
Jordan Bates
61813b28d7 Add Mistyped Captcha Errors option 2013-05-15 03:38:31 -07:00