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

94 Commits

Author SHA1 Message Date
Zixaphir
175880a4bd Merge branch 'v3' 
Conflicts:
	LICENSE
	builds/crx/script.js
 2013-08-13 15:13:13 -07:00
Zixaphir
2ea8441fd4 Fix a few small issues, new Linkifier regex 2013-08-13 04:26:20 -07:00
Zixaphir
6c2c9b281a Merge branch 'v3' 
Conflicts:
	builds/crx/script.js
	src/General/Config.coffee
	src/General/Settings.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Monitoring/ThreadWatcher.coffee
 2013-08-12 19:22:37 -07:00
Zixaphir
e0895c594a Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	css/style.css
	src/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/databoard.class
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee
 2013-08-12 18:26:39 -07:00
Mayhem
a1d238b233 Finish Thread Watcher rewrite. #99 2013-08-12 19:21:16 +02:00
Mayhem
6261160891 Start the Thread Watcher rewrite. #99 
Fix #1112.
 2013-08-12 19:20:56 +02:00
Mayhem
6d36518ea9 Remove the Check for Updates setting. 
It's not useful enough to justify keeping it.
 2013-08-12 17:26:41 +02:00
Zixaphir
92ffb4ff8c Why? Because I can. 2013-08-09 22:41:57 -07:00
Zixaphir
00675c32bc Merge branch 'v3' 
Conflicts:
	builds/crx/script.js
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/Quotelinks/QuoteYou.coffee
 2013-08-09 19:45:24 -07:00
Zixaphir
8b992d42ed Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3 
Conflicts:
	CHANGELOG.md
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/lib/$.coffee
	src/Miscellaneous/Time.coffee
 2013-08-09 19:36:40 -07:00
Zixaphir
dbc8e21297 Merge branch 'v3' 
Conflicts:
	builds/crx/script.js
 2013-08-08 23:56:30 -07:00
Zixaphir
6ba8d9ae8c Keybind to scroll to posts quoting you. 2013-08-08 23:53:48 -07:00
Mayhem
8c95fe1995 Tweak Dice code. #1218 2013-08-08 11:25:03 +02:00
carboncopy
bcbae6c84f display rolled dice while on /tg/ 2013-08-07 15:53:15 -05:00
Zixaphir
724aff27b5 Wow. Just... oops. 2013-08-04 23:50:53 -07:00
Zixaphir
217f1cd42c Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Main.coffee
	src/Linkification/Linkify.coffee
 2013-08-04 20:10:29 -07:00
Jordan Bates
ebb2d0bf75 Not sure how no one caught this. 2013-08-04 14:22:26 -07:00
Zixaphir
abb3b0e5b4 Disable Quote Threading by default 2013-07-27 03:58:19 -07:00
Zixaphir
a6d05a6115 Merge branch 'v3' 
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/lib/post.class
	src/Posting/QuickReply.coffee
 2013-07-24 22:17:35 -07:00
Jordan Bates
c9ec6b5497 Fix #113 2013-07-22 08:38:49 -07:00
Jordan Bates
3be249323a Change some defaults 2013-07-22 08:12:10 -07:00
Jordan Bates
9ba459ea8a Release 4chan X v1.2.19. 2013-07-14 03:58:01 -07:00
Zixaphir
4d194382c0 Ad fading 2013-07-07 13:08:42 -07:00
Zixaphir
3851be3898 HAEY KCUF! SMARTSHIFT! 2013-07-06 14:20:11 -07:00
Zixaphir
8490850939 Add an option to click current mascot to switch between mascots. 2013-06-20 19:31:34 -07:00
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