44 Commits

Author SHA1 Message Date
Zixaphir
97b3069af1 close #349 2013-06-04 10:48:13 -07:00
Zixaphir
2c2a40c0c9 Merge branch 'v3'
Conflicts:
	.gitignore
	CHANGELOG.md
	Gruntfile.coffee
	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/Config.coffee
2013-06-01 09:00:56 -07:00
Zixaphir
d64c21854b Make Appchan filters work in webkit. 2013-06-01 06:06:29 -07:00
Zixaphir
ab630bd21d This is going to take awhile. 2013-05-30 14:42:21 -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
Zixaphir
c4a008f402 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
	src/General/css/style.css
2013-05-10 07:19:08 -07:00
Jordan Bates
ac6f6800d6 Changelog styling 2013-05-10 05:34:05 -07:00
Zixaphir
5b84565c80 Merge branch 'v3'
Conflicts:
	CHANGELOG.md
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/appchan-x.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	latest.js
	package.json
2013-05-08 06:24:19 -07:00
Zixaphir
6a9e334c02 Generated by CS 2013-05-08 06:14:22 -07:00
Zixaphir
93b94ec9d0 Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	builds/version
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/Posting/QuickReply.coffee
	src/Quotelinks/QuoteInline.coffee
2013-05-06 16:54:39 -07:00
Jordan Bates
d321baef64 Fix #48 2013-05-03 15:16:40 -07:00
Zixaphir
ee00d5a3aa Merge branch 'v3' into Av2
Conflicts:
	LICENSE
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Main.coffee
	src/General/css/style.css
	src/General/html/Features/QuickReply.html
	src/Posting/QuickReply.coffee
2013-05-03 07:17:59 -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
Zixaphir
77433f5da8 Merge branch 'v3' into Av2
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/General/Config.coffee
	src/General/Main.coffee
	src/General/Settings.coffee
	src/General/css/burichan.css
	src/General/css/futaba.css
	src/General/css/photon.css
	src/General/css/style.css
	src/General/css/tomorrow.css
	src/General/css/yotsuba-b.css
	src/General/css/yotsuba.css
	src/General/img/favicons/Original/unreadDead.gif
	src/General/img/favicons/Original/unreadNSFW.gif
	src/General/img/favicons/Original/unreadSFW.gif
	src/General/img/favicons/dead.gif
	src/General/img/favicons/empty.gif
	src/General/img/favicons/ferongr/unreadDead.gif
	src/General/img/favicons/ferongr/unreadNSFW.gif
	src/General/img/favicons/ferongr/unreadSFW.gif
	src/General/meta/metadata.js
	src/Miscellaneous/AnnouncementHiding.coffee
	src/Miscellaneous/Keybinds.coffee
	src/Monitoring/ThreadStats.coffee
	src/Monitoring/ThreadUpdater.coffee
	src/Posting/QuickReply.coffee
	src/features/misc/header.coffee
	src/features/monitoring/favicon.coffee
2013-04-28 21:20:22 -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
3d07017708 Merge branch 'v3' into Av2
Conflicts:
	builds/4chan-X.js
	builds/4chan-X.user.js
	builds/crx.crx
	builds/crx/script.js
	src/config.coffee
	src/css/style.css
	src/features/misc/announcementhiding.coffee
	src/features/misc/header.coffee
	src/features/misc/keybinds.coffee
	src/main.coffee
	src/settings.coffee
2013-04-22 21:41:24 -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
21a0bba285 Merge branch 'v3' into Av2
Conflicts:
	Gruntfile.coffee
	builds/4chan-X.js
	builds/4chan-X.meta.js
	builds/4chan-X.user.js
	builds/appchan-x.js
	builds/crx.crx
	builds/crx/manifest.json
	builds/crx/script.js
	package.json
	src/code/main.coffee
	src/code/posting/qr.coffee
	src/css/burichan.css
	src/css/futaba.css
	src/css/photon.css
	src/css/style.css
	src/css/tomorrow.css
	src/css/yotsuba-b.css
	src/css/yotsuba.css
	src/features.coffee
	src/img/favicons/Original/unreadDead.gif
	src/img/favicons/Original/unreadNSFW.gif
	src/img/favicons/Original/unreadSFW.gif
	src/img/favicons/dead.gif
	src/img/favicons/empty.gif
	src/img/favicons/ferongr/unreadDead.gif
	src/img/favicons/ferongr/unreadNSFW.gif
	src/img/favicons/ferongr/unreadSFW.gif
2013-04-16 21:02:47 -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
e2b4684a32 pkg.name.zip 2013-04-14 15:55:34 -07:00
Zixaphir
a8fd11ae4a Fix some things. 2013-04-14 15:46:42 -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