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
|
161fc74414
|
Release 4chan X v1.1.3.
|
2013-04-28 11:20:36 -07:00 |
|
Jordan Bates
|
c82a548e41
|
Fix #34
|
2013-04-28 08:56:34 -07:00 |
|
seaweedchan
|
4497836e7a
|
Change null styling
|
2013-04-27 00:22:03 -07:00 |
|
Jordan Bates
|
10b4e084a6
|
Release 4chan X v1.1.2.
|
2013-04-26 17:49:41 -07:00 |
|
Jordan Bates
|
0ba258710d
|
Release 4chan X v1.1.1.
|
2013-04-26 04:49:08 -07:00 |
|
Jordan Bates
|
ad2b22a972
|
Merge fixes
|
2013-04-26 04:47:11 -07:00 |
|
Zixaphir
|
6cc5ac8dd2
|
Merge branch 'v3' of git://github.com/MayhemYDG/4chan-x into v3
Conflicts:
CHANGELOG.md
Gruntfile.js
LICENSE
lib/$.coffee
package.json
src/banner.js
src/config.coffee
src/css/style.css
src/features.coffee
src/metadata.js
|
2013-04-26 00:31:19 -07:00 |
|
Nicolas Stepien
|
43d97c326a
|
Shove that down the license.
|
2013-04-26 02:37:24 +02:00 |
|
Nicolas Stepien
|
4b474a5ec5
|
license
"damn i wouldn't like working with that kind of assholes around"
|
2013-04-25 20:51:38 +02:00 |
|
Jordan Bates
|
cedd14a040
|
Add license to grunt file
|
2013-04-25 05:19:08 -07:00 |
|
Jordan Bates
|
51f09aa048
|
Change all meta files
|
2013-04-24 09:54:23 -07:00 |
|
Nicolas Stepien
|
cf55f670c0
|
Merge branch 'master' into v3
I really need to get back to this.
|
2013-01-13 19:17:28 +01:00 |
|
Nicolas Stepien
|
b3d7f30f3a
|
Use Grunt for building from now on.
|
2012-09-24 22:37:33 +02:00 |
|