Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,172 Commits 2 Branches 0 Tags
Commit Graph

249 Commits

Author SHA1 Message Date
Zixaphir
db5cccc70f Merge branch 'mayhem' into v3 (Bugtesting time... yey... ;__;) 
Conflicts:
	css/burichan.css
	css/futaba.css
	css/photon.css
	css/tomorrow.css
	css/yotsuba-b.css
	css/yotsuba.css
	html/General/Settings-section-Main.html
	html/General/Settings.html
	src/Filtering/PostHiding.coffee
	src/General/Build.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Settings.coffee
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Monitoring/ThreadUpdater.coffee
 2014-02-28 19:59:04 -07:00
Zixaphir
553a5a9133 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/General/Index.coffee
	src/Posting/QR.coffee
 2014-02-28 19:37:26 -07:00
Mayhem
5581281c2e Update deps. 2014-02-27 15:01:13 +01:00
Kabir Sala
4adbe5a8d9 Release 1.4.0 2014-02-24 22:56:18 +01:00
Zixaphir
9d95bbea35 Merge branch 'mayhem' into v3 -- Still broken, do not merge (yet) 
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	css/burichan.css
	css/futaba.css
	css/photon.css
	css/style.css
	css/tomorrow.css
	css/yotsuba-b.css
	css/yotsuba.css
	html/General/Index-navlinks.html
	html/General/Settings-section-Rice.html
	html/General/Settings.html
	html/Posting/QR.html
	json/archives.json
	package.json
	src/Filtering/PostHiding.coffee
	src/Filtering/Recursive.coffee
	src/Filtering/ThreadHiding.coffee
	src/General/Build.coffee
	src/General/Config.coffee
	src/General/Get.coffee
	src/General/Header.coffee
	src/General/Index.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/UI.coffee
	src/General/lib/$.coffee
	src/General/lib/databoard.class
	src/General/lib/post.class
	src/General/lib/thread.class
	src/Images/ImageExpand.coffee
	src/Images/RevealSpoilers.coffee
	src/Linkification/Linkify.coffee
	src/Menu/Menu.coffee
	src/Miscellaneous/ExpandThread.coffee
	src/Miscellaneous/IDColor.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Monitoring/Unread.coffee
	src/Posting/QR.captcha.coffee
	src/Posting/QR.coffee
	src/Posting/QR.cooldown.coffee
	src/Quotelinks/QuoteBacklink.coffee
	src/Quotelinks/QuoteCT.coffee
	src/Quotelinks/QuoteOP.coffee
	src/Quotelinks/QuoteStrikeThrough.coffee
	src/Quotelinks/QuoteYou.coffee
	src/Quotelinks/Quotify.coffee
 2014-02-23 14:04:45 -07:00
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
Mayhem
9816866889 Release 4chan X v3.19.0. 2014-02-22 14:51:58 +01:00
Kabir Sala
2056fc85f2 update builds 2014-02-21 00:00:57 +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
Mayhem
d9cfe0e410 Release 4chan X v3.18.1. 2014-02-20 20:30:08 +01:00
Mayhem
621a3e83c1 Update deps. 2014-02-19 14:55:17 +01:00
Mayhem
756722e184 Merge branch 'v3' into cr32 2014-02-19 00:55:33 +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
Mayhem
f7d048de7b Release 4chan X v3.18.0. 2014-02-15 16:19:28 +01:00
Kabir Sala
3ad3af5dd9 Pass the images on Trimage 2014-02-13 18:36:31 +01:00
Mayhem
bbc3b54b52 Release 4chan X v3.17.1. 2014-02-10 22:16:03 +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
Mayhem
f8785c5445 Release 4chan X v3.17.0. 2014-02-09 19:08:16 +01:00
Mayhem
a072d67a8a Release 4chan X v3.16.5. 2014-02-07 23:15:52 +01:00
Mayhem
7ebfbe99de Update deps. 2014-02-07 23:14:15 +01:00
Mayhem
4191032381 Release 4chan X v3.16.4. 2014-02-04 18:55:16 +01:00
Mayhem
c98e6352dd Release 4chan X v3.16.3. 2014-02-04 18:46:33 +01:00
Mayhem
66f6c1f2a1 Release 4chan X v3.16.2. 2014-02-04 15:58:57 +01:00
Mayhem
47aa9d3bba Release 4chan X v3.16.1. 2014-02-01 21:39:28 +01:00
Mayhem
659b92aa99 Release 4chan X v3.16.0. 2014-01-30 14:09:10 +01:00
Mayhem
c1e76c8805 Update deps. 2014-01-29 23:45:55 +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
63638f47bb Up min Chrome version. 2014-01-23 18:01:07 +01: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