214 Commits

Author SHA1 Message Date
Zixaphir
7812001d96 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css
	src/Posting/QuickReply.coffee
2013-09-24 14:46:24 -07:00
Zixaphir
847078db53 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	json/archives.json
	package.json
	src/Filtering/Anonymize.coffee
	src/General/Config.coffee
	src/General/lib/post.class
	src/Linkification/Linkify.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
2013-09-20 05:45:04 -07:00
Mayhem
acffb4b7de Update deps. 2013-09-20 11:26:46 +02:00
Jordan Bates
4ee4856a78 Release 4chan X v1.2.39. 2013-09-19 11:30:50 -07:00
Jordan Bates
871dd7582b Release 4chan X v1.2.38. 2013-09-19 07:38:43 -07:00
Mayhem
15a51d2344 Release 4chan X v3.11.3. 2013-09-19 14:22:53 +02:00
Mayhem
93c297b324 Release 4chan X v3.11.2. 2013-09-17 09:51:21 +02:00
Mayhem
8dc39192dd Release 4chan X v3.11.1. 2013-09-13 17:05:12 +02:00
Jordan Bates
decfb32948 Release 4chan X v1.2.37. 2013-09-12 16:38:59 -07:00
Mayhem
2f2aedb70e Release 4chan X v3.11.0. 2013-09-06 15:20:17 +02:00
Zixaphir
fa569e5451 Release appchan x v2.3.10. 2013-08-31 10:17:11 -07:00
Zixaphir
75c7ef73cd Release appchan x v2.3.9. 2013-08-30 19:35:57 -07:00
Jordan Bates
bc0f30612c Release 4chan X v1.2.36. 2013-08-26 21:04:35 -07:00
Zixaphir
ace2f6384f Release appchan x v2.3.8. 2013-08-25 12:59:16 -07:00
Zixaphir
43d010bc8a Release appchan x v2.3.7. 2013-08-25 11:50:04 -07:00
Mayhem
132d94d441 Release 4chan X v3.10.0. 2013-08-22 13:21:37 +02:00
Zixaphir
a48e80ff5a Release appchan x v2.3.6. 2013-08-21 13:17:52 -07: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
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
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
Mayhem
62d292ebf9 Release 4chan X v3.9.0. 2013-08-18 16:35:43 +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
Mayhem
badc46b0a4 Use my fixed fork of Font Awesome instead.
The other one was based on an unstable branch.
2013-08-17 16:57:28 +02:00
Jordan Bates
36b2c78281 Release 4chan X v1.2.32. 2013-08-16 16:48:20 -07:00
Mayhem
030b1278bc Use Font Awesome to replace "QR" end "EAI".
Hopefully this'll make more sense for some users.
2013-08-16 22:43:02 +02:00
seaweedchan
81a2da0d27 Release 4chan X v1.2.31. 2013-08-16 03:13:49 -07:00
Zixaphir
060822ffe1 Release appchan x v2.3.3. 2013-08-16 00:09:40 -07:00
Jordan Bates
844d1f8921 Release 4chan X v1.2.30. 2013-08-15 20:30:46 -07:00
Mayhem
a19381763f Use load-grunt-tasks instead of matchdep. 2013-08-16 00:26:37 +02:00
Mayhem
6412503d1e Release 4chan X v3.8.0. 2013-08-15 20:58:19 +02:00
Jordan Bates
1491851eab Release 4chan X v1.2.29. 2013-08-14 17:24:55 -07:00
Jordan Bates
2eaf2c658c Release 4chan X v1.2.28. 2013-08-14 07:28:25 -07:00
seaweedchan
2fcbe0bf30 Merge Zixaphir X 2013-08-14 03:12:10 -07:00
Zixaphir
1f011dfd02 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	html/General/Header.html
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/UI.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteOP.coffee
2013-08-14 03:02:03 -07:00
Mayhem
e0a44bcb69 Release 4chan X v3.7.1. 2013-08-13 20:58:29 +02:00
Mayhem
1c33b235d0 Release 4chan X v3.7.0. 2013-08-13 17:13:59 +02:00
seaweedchan
570be575e6 Release 4chan X v1.2.27. 2013-08-12 01:39:20 -07:00
seaweedchan
caf7c67c62 Release 4chan X v1.2.26. 2013-08-12 01:29:44 -07:00
Zixaphir
9db6601ae5 Release appchan x v2.3.2. 2013-08-12 00:37:42 -07:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
Zixaphir
3c3606ad92 Release appchan x v2.3.1. 2013-08-11 14:05:16 -07:00
Zixaphir
0868e35000 Release appchan x v2.3.0. 2013-08-10 14:50:50 -07:00
Mayhem
79aa6eb975 Release 4chan X v3.6.0. 2013-08-10 15:34:22 +02: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
Zixaphir
2fa674c782 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.coffee
	json/archives.json
	src/Archive/Redirect.coffee
	src/General/lib/$.coffee
	src/Monitoring/Unread.coffee
2013-08-04 19:44:42 -07:00
Zixaphir
a54bc6a076 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.user.js
	builds/crx/script.js
2013-08-04 19:02:55 -07:00
Jordan Bates
d0bbe13172 Release 4chan X v1.2.25. 2013-08-04 14:32:25 -07:00