154 Commits

Author SHA1 Message Date
Jordan Bates
0f119e95fd Release 4chan X v1.2.33. 2013-08-18 21:17:00 -07: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
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
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
Mayhem
79aa6eb975 Release 4chan X v3.6.0. 2013-08-10 15:34:22 +02: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
Mayhem
82d3afba0a Tweak Gruntfile tasks loading. 2013-08-03 00:52:16 +02:00
Zixaphir
44a2b378ca 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
	package.json
	src/Posting/QuickReply.coffee
2013-07-24 21:49:24 -07:00
seaweedchan
979694a973 Release 4chan X v1.2.24. 2013-07-24 02:12:15 -07:00
seaweedchan
2a23975646 Release 4chan X v1.2.23. 2013-07-23 23:23:59 -07:00
seaweedchan
dc22609671 Update grunt-bump dependency
This is necessary for the bump-only change.
2013-07-23 01:56:50 -07:00
Jordan Bates
46f4b5325d Release 4chan X v1.2.21. 2013-07-22 08:55:30 -07:00
Jordan Bates
cc86e47bab Release 4chan X v1.2.20. 2013-07-22 08:16:02 -07:00
Zixaphir
d2bcf840ff 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
	src/Archive/Redirect.coffee
2013-07-21 08:43:58 -07:00
Zixaphir
582d067a10 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	Gruntfile.js
	README.md
	changelog-old
	css/style.css
	html/Monitoring/ThreadStats.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/html/Settings/Filter-guide.html
	src/General/lib/$.coffee
	src/General/lib/clone.class
	src/General/lib/post.class
	src/Images/ImageHover.coffee
	src/Menu/Menu.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuotePreview.coffee
	src/Quotelinks/Quotify.coffee
2013-07-21 08:39:40 -07:00
Mayhem
b903117ea9 Update deps. 2013-07-20 16:26:03 +02:00
Jordan Bates
9ba459ea8a Release 4chan X v1.2.19. 2013-07-14 03:58:01 -07:00
Mayhem
95df86d83b Release 4chan X v3.5.7. 2013-07-13 16:46:24 +02:00
Mayhem
515953e934 Update deps.
Actually this is just an excuse to test something.
2013-07-04 15:48:39 +02:00
Mayhem
70daa0352d Release 4chan X v3.5.6. 2013-07-02 18:53:29 +02:00
Mayhem
b66a911a03 Update deps. 2013-06-27 21:37:13 +02:00
Jordan Bates
36bc01469b Release 4chan X v1.2.18. 2013-06-27 07:28:25 -07:00
Mayhem
1947317499 Release 4chan X v3.5.5. 2013-06-20 18:44:46 +02:00
Mayhem
f95c943818 Update deps. 2013-06-19 21:20:26 +02:00
Jordan Bates
52791e5ace Release 4chan X v1.2.17. 2013-06-17 07:32:21 -07:00
Jordan Bates
9bd4bae8ec Release 4chan X v1.2.16. 2013-06-16 13:25:41 -07:00
Jordan Bates
c1dfa9ecf6 Release 4chan X v1.2.15. 2013-06-14 07:31:24 -07:00
seaweedchan
54af49b002 Release 4chan X v1.2.14. 2013-06-14 03:41:16 -07:00
seaweedchan
af21ad07bc Merge Mayhem X 2013-06-14 03:14:54 -07:00
Mayhem
9728de55ac Release 4chan X v3.5.4. 2013-06-11 20:52:46 +02:00
Mayhem
81e36308f2 Release 4chan X v3.5.3. 2013-06-11 17:37:22 +02:00
Mayhem
757bd220b5 Release 4chan X v3.5.2. 2013-06-01 20:56:13 +02:00
Mayhem
2200a3ce52 Release 4chan X v3.5.1. 2013-06-01 17:49:59 +02:00
Mayhem
cbd00356d8 Update deps. 2013-05-31 20:51:37 +02:00