119 Commits

Author SHA1 Message Date
Zixaphir
d4a3bc8a17 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Settings.coffee
	src/General/css/font-awesome.css
	src/Images/FappeTyme.coffee
	src/Images/Gallery.coffee
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee
2013-08-24 13:57:27 -07:00
Zixaphir
c4fdaea615 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	css/style.css
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/lib/post.class
	src/Posting/QuickReply.coffee
2013-08-24 13:08:23 -07:00
Zixaphir
dc0b4d3d41 Keybinds, Werk Tyme, more Mayhem-X-like IDColor 2013-08-24 11:24:49 -07:00
Zixaphir
8c1ac1710a Gallery stuff. 2013-08-23 14:37:20 -07:00
NoneGiven
cb498db8df Typo
It just werx
2013-08-23 02:04:19 +02:00
noface
01146f85c5 Close #1255. 2013-08-23 01:04:44 +02:00
Zixaphir
8e4d88eb16 Port Appchan's Gallery 2013-08-22 12:28:55 -07:00
Zixaphir
b55cda889e Enable Gallery by default 2013-08-22 10:45:41 -07:00
Zixaphir
3e2bfee617 Pretty much finish up the Gallery 2013-08-20 09:04:56 -07:00
Zixaphir
1cf8b0fe9e Werk Tyme 2013-08-20 01:11:32 -07:00
Mayhem
4196ce2600 Clean links from spoiler and code tags. 2013-08-20 00:33:56 +02:00
Jordan Bates
a1ad605f9e Disable notifications 2013-08-18 21:09:03 -07:00
noface
202d7617e3 Add Linkification. 2013-08-18 20:53:08 +02:00
Zixaphir
72e3fc2585 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/html/Features/QuickReply.html
	src/General/img/favicons/xat-/unreadDead.png
	src/General/img/favicons/xat-/unreadDeadY.png
	src/General/img/favicons/xat-/unreadNSFW.png
	src/General/img/favicons/xat-/unreadNSFWY.png
	src/General/img/favicons/xat-/unreadSFW.png
	src/General/img/favicons/xat-/unreadSFWY.png
	src/General/meta/banner.js
	src/General/meta/metadata.js
	src/Images/ImageExpand.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Posting/QuickReply.coffee
2013-08-18 11:17:07 -07:00
Zixaphir
7fd7c249dc Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	package.json
	src/General/Config.coffee
2013-08-18 10:24:51 -07:00
Mayhem
a1e8d1a924 Remove the Tab to Choose Files First on Firefox.
Firefox forces the flex order as tab order so the setting is useless.
2013-08-18 17:48:52 +02:00
seaweedchan
1fb2897baa Some shortcut icon tweaks 2013-08-18 03:42:25 -07:00
Zixaphir
ec32e54ef5 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	css/style.css
	src/General/Config.coffee
	src/General/meta/manifest.json
	src/Posting/QuickReply.coffee
2013-08-17 21:00:31 -07:00
Mayhem
5742405f67 Add desktop notification permission granting setting and notice. 2013-08-17 22:37:30 +02:00
seaweedchan
2dedd6af1d Just in case 2013-08-16 02:47:35 -07:00
seaweedchan
7f52115b38 Banner changing and title editing
from Appchan X
2013-08-16 01:52:28 -07:00
Zixaphir
bc501dc022 Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/html/Monitoring/ThreadWatcher.html
	src/Images/ImageExpand.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
2013-08-15 23:02:54 -07:00
Zixaphir
175880a4bd Merge branch 'v3'
Conflicts:
	LICENSE
	builds/crx/script.js
2013-08-13 15:13:13 -07:00
seaweedchan
f2b15cd0ab Merge Zixaphir X 2013-08-13 05:28:46 -07:00
Zixaphir
2ea8441fd4 Fix a few small issues, new Linkifier regex 2013-08-13 04:26:20 -07:00
seaweedchan
b9b4efae5e Merge in new thread watcher and change a few things 2013-08-13 00:03:29 -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
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07: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