168 Commits

Author SHA1 Message Date
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
Mayhem
82d3afba0a Tweak Gruntfile tasks loading. 2013-08-03 00:52:16 +02:00
Zixaphir
8309ae41ce Release appchan x v2.2.2. 2013-08-01 10:33:03 -07:00
Zixaphir
b305aaf6c8 Release appchan x v2.2.1. 2013-07-27 03:59:14 -07:00
Zixaphir
086b93f189 Release appchan x v2.2.0. 2013-07-25 13:05:24 -07: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
16b35dffce Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	Gruntfile.coffee
	LICENSE
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/Config.coffee
	src/General/Globals.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/UI.coffee
	src/General/css/style.css
	src/General/meta/manifest.json
	src/Posting/QuickReply.coffee
2013-07-21 09:01:27 -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
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
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
Zixaphir
feeae455c2 Release appchan x v2.1.3. 2013-06-04 04:19:13 -07:00
Zixaphir
d0919fb29d Release appchan x v2.1.2. 2013-06-04 02:52:33 -07:00
Zixaphir
3c4d53cdab Start styling the front page again. 2013-06-03 03:47:19 -07:00
Zixaphir
21f51a9e24 Correct files metadata #346 2013-06-03 01:57:29 -07:00
Zixaphir
718a973f03 Release appchan x v2.1.1. 2013-06-02 14:53:47 -07:00
Mayhem
757bd220b5 Release 4chan X v3.5.2. 2013-06-01 20:56:13 +02:00
Zixaphir
689a045a55 Release appchan x v2.1.0. 2013-06-01 09:04:18 -07: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
Zixaphir
f5daafd92b Release appchan x v2.0.6. 2013-05-29 05:55:58 -07:00
Zixaphir
914fe88e75 Release appchan x v2.0.5. 2013-05-28 16:22:13 -07:00
Jordan Bates
0ca4fff421 Release 4chan X v1.2.13. 2013-05-28 10:30:05 -07:00
Jordan Bates
7e5b9eb3d9 Release 4chan X v1.2.12. 2013-05-27 16:20:19 -07:00
Jordan Bates
a9efc9d79d Release 4chan X v1.2.11. 2013-05-27 06:15:04 -07:00
Mayhem
d2a54dab41 Release 4chan X v3.5.0. 2013-05-26 01:07:08 +02:00
Jordan Bates
f2594944e4 Release 4chan X v1.2.10. 2013-05-25 15:14:14 -07:00