227 Commits

Author SHA1 Message Date
Kabir Sala
4adbe5a8d9 Release 1.4.0 2014-02-24 22:56:18 +01:00
Kabir Sala
5916115cd8 Merge zix v3 2014-02-20 23:33:47 +01:00
Kabir Sala
8b38aaea1a Bump version, update builds 2014-02-20 21:35:50 +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
c409efe5f3 Update CHANGELOG 2014-02-15 22:50:36 +01:00
Kabir Sala
3ad3af5dd9 Pass the images on Trimage 2014-02-13 18:36:31 +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
2ac2286ad5 Merge branch 'mayhem' into v3
Conflicts:
	CHANGELOG.md
	src/General/lib/$.coffee
	src/Images/Sauce.coffee
2014-01-28 01:11:06 -07:00
Mayhem
c430e97afd Update deps.
Fix gruntjs/grunt-contrib-compress#80
2014-01-22 20:32: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
Mayhem
b0689af89a Release 4chan X v3.15.2. 2014-01-22 09:31:06 +01:00
Mayhem
64a90bf8d3 Up min Chrome requirement. 2014-01-21 14:55:14 +01:00
Mayhem
6c6f94bf58 Up min Chrome requirement. 2014-01-21 14:23:45 +01:00
Mayhem
ee1e5d03e6 Update min Firefox/GM versions. 2014-01-21 13:48:23 +01:00
Mayhem
ba0830e828 Release 4chan X v3.15.1. 2014-01-20 10:06:29 +01:00
Mayhem
bb00d4c203 Update deps. 2014-01-20 09:36:18 +01:00
Mayhem
8402c40627 Update deps. 2014-01-17 17:43:30 +01: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
Jordan
8419b7c88b Merge Zixaphir X, close #221 2014-01-08 20:55:13 -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
Jordan
4d3195bbb9 Update font-awesome 2014-01-07 02:00:47 -07:00
Zixaphir
a51e1455f7 Update minimum browser versions to latest stable versions 2013-12-26 16:05:17 -07:00
Zixaphir
b38f63e313 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.coffee
	src/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/lib/$.coffee
	src/Menu/Menu.coffee
	src/Posting/QuickReply.coffee
2013-12-25 10:54:21 -07:00
Mayhem
a36806a8e3 Update deps. 2013-12-25 00:41:08 +01: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
Mayhem
cfbdf1edb5 Release 4chan X v3.15.0. 2013-12-13 14:23:46 +01:00
Mayhem
542803ade0 Release 4chan X v3.14.3. 2013-12-09 11:25:59 +01:00
Jordan Bates
4fd8e6a4bf Release 4chan X v1.2.44. 2013-12-06 17:11:47 -07:00
Mayhem
cff5f21e39 Release 4chan X v3.14.2. 2013-12-07 00:04:23 +01:00
Mayhem
6a9b1a0150 Release 4chan X v3.14.1. 2013-11-25 13:44:43 +01: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
Mayhem
ce0c0c1623 Release 4chan X v3.14.0. 2013-11-21 23:11:32 +01:00
Mayhem
985afb2a1a Support 4cdn. 2013-11-21 23:11:02 +01:00
Mayhem
a907fa665d Release 4chan X v3.13.0. 2013-11-16 21:23:17 +01:00
Mayhem
c318fb37b9 Update deps. 2013-11-16 15:51:07 +01:00
Jordan Bates
b9a0d453db Release 4chan X v1.2.43. 2013-11-10 23:36:52 -07:00
Mayhem
6975a766b9 Update font-awesome. 2013-11-07 22:34:41 +01:00
Mayhem
5db85bc454 Release 4chan X v3.12.1. 2013-11-04 19:51:51 +01:00
Mayhem
b94a6327ab Release 4chan X v3.12.0. 2013-11-03 21:15:15 +01:00
Mayhem
a22bce79ab Warn users about outdated versions of Greasemonkey. 2013-11-02 19:20:28 +01:00
Mayhem
4ff5fd287a Update FontAwesome. 2013-10-23 21:13:10 +02:00
Mayhem
cbd01e9fb9 Update deps. 2013-10-23 20:21:18 +02:00