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

119 Commits

Author SHA1 Message Date
Zixaphir
ebfaaaacc4 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-06-20 17:21:01 -07:00
Zixaphir
2c7900442c Oh lawd, is that a commit? 2013-06-20 17:09:20 -07:00
seaweedchan
972a8b5261 Indicate Spoilers -> Reveal Spoilers, changelog 2013-06-14 03:37:41 -07:00
seaweedchan
f6d8ee29ae Close #102 2013-06-14 03:30:18 -07:00
seaweedchan
af21ad07bc Merge Mayhem X 2013-06-14 03:14:54 -07:00
Zixaphir
191aec36ad Rethink Emoji. 2013-06-06 07:19:46 -07:00
Zixaphir
97b3069af1 close #349 2013-06-04 10:48:13 -07:00
Zixaphir
6121f30b73 Fix a conflict with adblock plus resulting in a blank page 2013-06-02 12:40:54 -07:00
Zixaphir
2c2a40c0c9 Merge branch 'v3' 
Conflicts:
	.gitignore
	CHANGELOG.md
	Gruntfile.coffee
	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
 2013-06-01 09:00:56 -07:00
Mayhem
1752e15da9 Close #1128. 2013-05-31 21:44:06 +02:00
Jordan Bates
ecdd13f9b0 Remove update checking for Chrome/Opera Next users 2013-05-29 11:54:31 -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
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
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
139e2f9768 hue hue hue hue 
(image prefetching)
 2013-05-23 13:09:11 -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
75735aedf0 Advance on contract option, close #74 2013-05-19 21:24:21 -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
Zixaphir
c2fb771fc1 Merge branch 'v3' 
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
 2013-05-14 19:44:04 -07:00
Zixaphir
dc4c3a5e41 close #303 2013-05-14 19:42:58 -07:00
Zixaphir
f3d3360300 Close #304 2013-05-14 19:23:22 -07:00
Jordan Bates
b1e06601aa @zixaphir in charge of not making small mistakes :3 2013-05-14 18:08:11 -07:00
Zixaphir
4b8b9ad493 Merge branch 'v3' 
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
	src/General/Settings.coffee
 2013-05-14 13:15:39 -07:00
Zixaphir
722e2ebb5d Quoted Title 2013-05-14 12:53:33 -07:00
Zixaphir
1debf61f2e 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/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/html/Settings/Advanced.html
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
 2013-05-14 11:40:38 -07:00
Mayhem
f072e68f6e Close #1087. 2013-05-12 23:53:15 +02:00
seaweedchan
045b1aa788 Change description 2013-05-11 05:03:59 -07:00
seaweedchan
c158e0475a Fix #71 2013-05-11 04:58:24 -07:00
seaweedchan
f0f1fdb0b5 Give in and add fixed thread watcher option 2013-05-11 04:31:02 -07:00
Zixaphir
98b1f79402 Maybe when there's a FAQ relevant to appchan. 2013-05-10 16:12:42 -07:00
Zixaphir
c4a008f402 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css
 2013-05-10 07:19:08 -07:00
Jordan Bates
cb6552e291 Change board navigation default 2013-05-10 06:13:32 -07:00
Zixaphir
9ce09d216e Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Features/QuickReply.html
	src/Menu/Menu.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Posting/QuickReply.coffee
 2013-05-10 02:41:08 -07:00
Jordan Bates
875bc98d0f Catch up to Mayhem, without archive changes 2013-05-09 19:33:33 -07:00
Zixaphir
d70baf3f78 Set default font size to 13 2013-05-09 02:41:06 -07:00
Zixaphir
94124f953b Add options for header and page QR shortcuts. #280 2013-05-09 02:02:59 -07:00
Mayhem
17b4a6a2f9 Replace join('\n') with triple quotes. 2013-05-08 21:34:10 +02:00
Zixaphir
7396b327c8 Merge branch 'v3' into Av2 
Conflicts:
	builds/4chan-X.js
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/Monitoring/ThreadWatcher.coffee
 2013-05-07 21:09:24 -07:00
Jordan Bates
015bc15641 Close #60 2013-05-07 20:28:34 -07:00
Jordan Bates
f6bfd27622 Centered links option 2013-05-07 20:02:19 -07:00
Zixaphir
0146f51c4c Header changes. 2013-05-07 18:59:13 -07:00