95 Commits

Author SHA1 Message Date
Zixaphir
6884039627 Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/Posting/QR.coffee
2014-02-23 08:49:32 -07:00
Kabir Sala
fa024c3044 update builds 2014-02-21 00:02:36 +01:00
Kabir Sala
2056fc85f2 update builds 2014-02-21 00:00:57 +01:00
Kabir Sala
6d1ec737d7 Bump everything 2014-02-20 21:00:06 +01:00
Zixaphir
6dd0cac797 Merge branch 'master' of https://github.com/Spittie/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/Monitoring/Favicon.coffee
2014-02-16 01:00:41 -07:00
Kabir Sala
531ebd9cce Update builds 2014-02-15 22:53:31 +01:00
Kabir Sala
e082c4336d Update .crx 2014-02-13 18:37:20 +01:00
Kabir Sala
d8a168a549 More work on post from url 2014-02-11 23:37:52 +01:00
Kabir Sala
feedeaaec1 Update crx 2014-02-10 15:48:42 +01:00
Kabir Sala
6c2579449a Release 4chan X v1.3.4. 2014-02-10 01:57:43 +01:00
Kabir Sala
1b6052304b Stuff 2014-02-09 21:43:31 +01:00
Kabir Sala
3bd506e617 Copy Mayhem 2014-02-09 19:36:28 +01:00
Zixaphir
b6749b91a5 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	CONTRIBUTING.md
	css/style.css
	html/General/Settings-section-Main.html
	json/archives.json
	package.json
	src/Archive/Redirect.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/$.coffee
	src/General/lib/thread.class
	src/Linkification/Linkify.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadStats.coffee
2014-01-22 12:10:34 -07:00
Jordan
d7b140cc3b Release 4chan X v1.3.2. 2014-01-12 19:55:02 -07:00
Jordan
1c253782e8 Release 4chan X v1.3.1. 2014-01-12 09:51:00 -07:00
Jordan
3aea514ca1 Release 4chan X v1.3.0. 2014-01-10 09:46:48 -07:00
Zixaphir
63b09cb803 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/Archive/Redirect.coffee
	src/General/Build.coffee
	src/General/css/font-awesome.css
	src/General/lib/databoard.class
	src/Miscellaneous/ExpandThread.coffee
	src/Monitoring/ThreadUpdater.coffee
2014-01-07 20:28:47 -07:00
Jordan
08ae1daee8 Release 4chan X v1.2.45. 2014-01-07 03:17:48 -07:00
Jordan
4735b8dae5 Update for 4cdn, maybe fix issues like #219? 2014-01-07 02:27:40 -07:00
Zixaphir
a51e1455f7 Update minimum browser versions to latest stable versions 2013-12-26 16:05:17 -07:00
Zixaphir
5d6b357135 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	src/General/lib/post.class
2013-12-18 12:21:43 -07:00
Jordan Bates
4fd8e6a4bf Release 4chan X v1.2.44. 2013-12-06 17:11:47 -07:00
Zixaphir
7fb48b93d4 Merge branch 'master' of https://github.com/seaweedchan/4chan-x into v3
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/script.js
	json/archives.json
2013-11-23 11:17:11 -07:00
Zixaphir
a3c1afa5cd Merge -- probably bugged until I sort out everything
that's actually changed. Honestly, all I wanted was the
4cdn changes, but any excuse to merge was good enough, I guess.

Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3

Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	changelog-old
	css/style.css
	html/General/Settings.html
	html/Monitoring/ThreadUpdater.html
	html/Monitoring/ThreadWatcher.html
	html/Posting/QR.html
	package.json
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Header.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/lib/post.class
	src/General/meta/manifest.json
	src/Images/ImageExpand.coffee
	src/Meta/banner.js
	src/Miscellaneous/ExpandComment.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Miscellaneous/Nav.coffee
	src/Monitoring/Favicon.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/ThreadWatcher.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QuickReply.coffee
2013-11-22 17:25:06 -07:00
Jordan Bates
b9a0d453db Release 4chan X v1.2.43. 2013-11-10 23:36:52 -07:00
Jordan Bates
528f95d5f5 Release 4chan X v1.2.42. 2013-10-22 18:27:12 -07:00
seaweedchan
26a0c27ac3 Release 4chan X v1.2.41. 2013-10-03 16:49:16 -07:00
seaweedchan
c6d5c0c463 Release 4chan X v1.2.40. 2013-09-22 04:45:33 -07: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
Jordan Bates
decfb32948 Release 4chan X v1.2.37. 2013-09-12 16:38:59 -07:00
Jordan Bates
bc0f30612c Release 4chan X v1.2.36. 2013-08-26 21:04:35 -07:00
Jordan Bates
231e151fbb Release 4chan X v1.2.35. 2013-08-20 15:19:31 -07:00
Jordan Bates
0442192181 Release 4chan X v1.2.34. 2013-08-19 07:38:57 -07:00
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
Jordan Bates
36b2c78281 Release 4chan X v1.2.32. 2013-08-16 16:48:20 -07: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
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
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
Jordan Bates
d0bbe13172 Release 4chan X v1.2.25. 2013-08-04 14:32:25 -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
c34f6693cb Release 4chan X v1.2.22. 2013-07-23 01:54:28 -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