334 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
50416a0aab Cleanup 2013-08-24 13:10:03 -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
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
ccc0335b79 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	css/style.css
	html/Monitoring/ThreadWatcher.html
	json/archives.json
	package.json
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/img/favicons/empty.gif
	src/Linkification/Linkify.coffee
	src/Miscellaneous/ExpandComment.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
2013-08-22 12:10:33 -07:00
Mayhem
132d94d441 Release 4chan X v3.10.0. 2013-08-22 13:21:37 +02:00
Zixaphir
73ae91589e Update CHANGELOG.md 2013-08-21 15:56:51 -07:00
Zixaphir
a48e80ff5a Release appchan x v2.3.6. 2013-08-21 13:17:52 -07:00
Mayhem
6454090cfd Warn with a desktop notification when we're running low on cached captchas. Close #1253.
Also increase delay to close the notifications from 5 to 7 seconds. #1252
2013-08-21 16:24:48 +02:00
Jordan Bates
231e151fbb Release 4chan X v1.2.35. 2013-08-20 15:19:31 -07:00
Zixaphir
f20b0ac3f7 Release appchan x v2.3.5. 2013-08-19 22:46:34 -07:00
Mayhem
8b6647b344 Changelog. 2013-08-20 00:45:14 +02:00
Jordan Bates
175552b94a Merge branch 'master' of https://github.com/seaweedchan/4chan-x 2013-08-19 07:39:51 -07:00
Jordan Bates
0442192181 Release 4chan X v1.2.34. 2013-08-19 07:38:57 -07:00
Zixaphir
8656eb34c7 Release appchan x v2.3.4. 2013-08-18 23:37:46 -07:00
seaweedchan
9f33d95aa7 Update CHANGELOG.md 2013-08-18 21:35:43 -07:00
Jordan Bates
0f119e95fd Release 4chan X v1.2.33. 2013-08-18 21:17:00 -07: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
62d292ebf9 Release 4chan X v3.9.0. 2013-08-18 16:35:43 +02:00
Mayhem
e0f28283c5 Changelog. 2013-08-18 16:27:44 +02:00
Zixaphir
d15f8ee728 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	css/style.css
	html/Posting/QR.html
	img/changelog/3.2.0/0.png
	package.json
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Notice.coffee
	src/General/Notification.coffee
	src/General/Settings.coffee
	src/General/img/icon.gif
	src/General/lib/notification.class
	src/Monitoring/Favicon.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteOP.coffee
2013-08-17 20:33:48 -07:00
Zixaphir
2abb4e96d3 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/Theming/Banner.coffee
2013-08-16 20:04:31 -07:00
Jordan Bates
36b2c78281 Release 4chan X v1.2.32. 2013-08-16 16:48:20 -07:00
Zixaphir
05141445fa Trunctuate changelog 2013-08-16 03:47:56 -07:00
Zixaphir
298b5d3270 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	builds/appchan-x.user.js
	builds/crx/script.js
	src/General/Config.coffee
	src/General/css/style.css
2013-08-16 03:39:33 -07:00
seaweedchan
81a2da0d27 Release 4chan X v1.2.31. 2013-08-16 03:13:49 -07:00
seaweedchan
109699d83a More optimizations + changelog 2013-08-16 02:24:24 -07:00
Zixaphir
060822ffe1 Release appchan x v2.3.3. 2013-08-16 00:09:40 -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
Jordan Bates
844d1f8921 Release 4chan X v1.2.30. 2013-08-15 20:30:46 -07:00
Jordan Bates
5c1fd5a88e Changelog 2013-08-15 20:28:47 -07:00
Mayhem
6412503d1e Release 4chan X v3.8.0. 2013-08-15 20:58:19 +02:00
Mayhem
ed705c202a Fix changelog. 2013-08-15 20:12:19 +02:00
Mayhem
3bd1193251 Add filename editing demo GIF. 2013-08-15 20:06:43 +02:00
Jordan Bates
1491851eab Release 4chan X v1.2.29. 2013-08-14 17:24:55 -07:00
Mayhem
8135e93db8 On-the-fly QR filename editing. 2013-08-15 00:24:40 +02:00
Jordan Bates
5a17155582 Update changelog 2013-08-14 07:30:23 -07:00
Jordan Bates
2eaf2c658c Release 4chan X v1.2.28. 2013-08-14 07:28:25 -07:00
seaweedchan
57720fb00c Update changelog 2013-08-14 05:18:26 -07:00
seaweedchan
5a46958ab2 Update changelog 2013-08-14 05:17:43 -07:00
Mayhem
e0a44bcb69 Release 4chan X v3.7.1. 2013-08-13 20:58:29 +02:00
Mayhem
4c6323dc6e Fx <23 doesn't have HTMLCanvasElement? 2013-08-13 20:58:06 +02:00
Mayhem
1c33b235d0 Release 4chan X v3.7.0. 2013-08-13 17:13:59 +02:00
Mayhem
3f1625f881 Fix third level lists markdown in changelog. 2013-08-13 16:52:38 +02: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