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 |
|