100 Commits

Author SHA1 Message Date
Zixaphir
a4b0468698 Revert gruntfile changes 2013-08-14 03:38:18 -07:00
seaweedchan
caf7c67c62 Release 4chan X v1.2.26. 2013-08-12 01:29:44 -07:00
seaweedchan
58d06b4db6 Remove some unwanted changes 2013-08-12 01:21:22 -07:00
seaweedchan
875f0cd4f8 Merge Zixaphir X 2013-08-12 00:07:39 -07:00
Zixaphir
00093ffd0c Fix building before release 2013-08-11 14:00:01 -07:00
Zixaphir
f8f9142576 We don't have stable-v3 like Mayhem does 2013-08-10 15:34:57 -07:00
Zixaphir
6602bb885d Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	CHANGELOG.md
	Gruntfile.coffee
	package.json
	src/Quotelinks/QuoteYou.coffee
2013-08-10 14:37:45 -07:00
Mayhem
1d83ccbc12 .nex files are not necessary anymore. 2013-08-10 15:48:47 +02:00
Zixaphir
cb30242ae8 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	src/General/Header.coffee
2013-08-05 14:37:23 -07:00
Zixaphir
d2eef4c4c5 Restore concat:meta 2013-08-05 00:30:32 -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
Mayhem
82d3afba0a Tweak Gruntfile tasks loading. 2013-08-03 00:52:16 +02:00
Mayhem
0b6f66ca81 A few alignement tweaks. 2013-08-03 00:27:36 +02:00
James Campos
eef94f971c Gruntfile.js -> Gruntfile.coffee
Close #1209
2013-08-03 00:15:44 +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
c34f6693cb Release 4chan X v1.2.22. 2013-07-23 01:54:28 -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
Jordan Bates
71e004af9a I'll no longer be supporting the Opera extension. 2013-06-27 07:43:07 -07:00
Jordan Bates
9685885b01 Lets use copy instead of compress 2013-05-28 13:51:27 -07:00
Jordan Bates
3535f8919b Meh. Lets just use the crx folder for Opera. 2013-05-28 13:44:57 -07:00
Jordan Bates
561d3a004b Opera 15 wants .nex 2013-05-28 12:58:53 -07:00
Jordan Bates
a30a5927c8 Opera 15 extension 2013-05-28 12:40:42 -07:00
Jordan Bates
ac6f6800d6 Changelog styling 2013-05-10 05:34:05 -07:00
Zixaphir
6a9e334c02 Generated by CS 2013-05-08 06:14:22 -07:00
Jordan Bates
d321baef64 Fix #48 2013-05-03 15:16:40 -07:00
Jordan Bates
9c0dd570dd Check for updates 2013-05-01 11:30:23 -07:00
Jordan Bates
c5cdbd62df Build 2013-04-29 14:23:07 -07:00
Jordan Bates
bec6181d96 Create zip file on release 2013-04-26 15:28:27 -07:00
Jordan Bates
e70514b6ec Finish structure 2013-04-26 14:43:01 -07:00
Jordan Bates
88321d357f Further update to structure change 2013-04-26 14:19:20 -07:00
Jordan Bates
0ba258710d Release 4chan X v1.1.1. 2013-04-26 04:49:08 -07:00
Jordan Bates
c52f9fcf9e Readd git checkout line 2013-04-25 16:47:39 -07:00
Jordan Bates
a703c2dcd6 Release 4chan X v1.1.0. 2013-04-25 16:19:45 -07:00
Jordan Bates
5afab40940 Use stable in grunt file 2013-04-25 15:18:40 -07:00
Jordan Bates
cedd14a040 Add license to grunt file 2013-04-25 05:19:08 -07:00
Jordan Bates
6a8a23d353 reloadPkh -> reloadPkg 2013-04-24 13:57:23 -07:00
Jordan Bates
2abc54f3de Readd 4chan-X.meta.js 2013-04-24 10:08:40 -07:00
Zixaphir
a067ad6262 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.js
	src/config.coffee
	src/css/style.css
	src/features.coffee
	src/main.coffee
2013-04-23 23:36:12 -07:00
Zixaphir
4856a6778d Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	.gitignore
	Gruntfile.js
	src/config.coffee
	src/css/style.css
	src/features.coffee
	src/features/posting/qr.coffee
2013-04-22 01:24:11 -07:00
Zixaphir
6257982bf0 code > features 2013-04-21 17:49:35 -07:00
Zixaphir
9f8f8efd80 BREAK EVERYTHING INTO PIECES 2013-04-16 19:45:39 -07:00
Zixaphir
599eaef3df Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.js
	src/features.coffee
	src/main.coffee
2013-04-16 18:03:14 -07:00
Zixaphir
85621c4907 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.js
	src/features.coffee
2013-04-14 13:49:33 -07:00
Zixaphir
739220ed11 Expose builds/ because botnets. 2013-04-14 01:03:07 -07:00
Zixaphir
f453276a9c Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	Gruntfile.js
	src/config.coffee
	src/features.coffee
	src/main.coffee
	src/qr.coffee
2013-04-08 07:44:26 -07:00
Zixaphir
db1c2b76b3 Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	src/features.coffee
2013-03-28 20:45:12 -07:00
Zixaphir
1662401958 Merge remote-tracking branch 'mayhem/v3' into v3
Conflicts:
	.gitattributes
	4chan-X.meta.js
	4chan-X.user.js
	Gruntfile.js
	lib/$.coffee
	src/config.coffee
	src/features.coffee
	src/globals.coffee
2013-03-28 20:42:02 -07:00
Zixaphir
f50c1fcedf Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
	4chan_x.user.js
2013-03-18 12:28:52 -07:00
Zixaphir
611377152e Start my quest to integrate 4chan-X V3 2013-03-12 03:53:57 -07:00