Tom French
|
009c5389bf
|
JSHint, restoring .gitignore
|
2014-05-31 18:08:33 +01:00 |
|
Tom French
|
0d8db88e71
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
.gitignore
dist/fabric.js
dist/fabric.require.js
src/brushes/circle_brush.class.js
src/canvas.class.js
src/mixins/canvas_events.mixin.js
src/mixins/object_geometry.mixin.js
src/mixins/object_interactivity.mixin.js
src/shapes/group.class.js
src/shapes/image.class.js
src/shapes/object.class.js
src/shapes/path_group.class.js
src/shapes/text.class.js
|
2014-05-31 17:29:55 +01:00 |
|
Kienz
|
dab103cafe
|
Add coverage to .gitignore
|
2014-05-09 20:12:57 +02:00 |
|
XhmikosR
|
412dac459a
|
Update .gitignore.
|
2014-02-23 20:25:52 +02:00 |
|
Tom French
|
ce4809d1e8
|
Merge branch 'master' of https://github.com/kangax/fabric.js
Conflicts:
dist/all.js
dist/all.require.js
src/brushes/circle_brush.class.js
src/brushes/spray_brush.class.js
src/canvas.class.js
src/mixins/canvas_events.mixin.js
src/mixins/object_interactivity.mixin.js
src/shapes/group.class.js
src/shapes/image.class.js
src/shapes/object.class.js
src/util/misc.js
|
2013-12-05 19:45:39 +00:00 |
|
kangax
|
70cf7a6963
|
Tweak docs
|
2013-05-09 12:14:30 -04:00 |
|
David Rice
|
1a28e92172
|
Ignore .DS_Store files
|
2012-08-08 21:02:20 +01:00 |
|
kangax
|
6e9543cb69
|
Preparing fabric for publishing through npm. Make fabric.createCanvasForNode accept width/height rather than reference to node-canvas, to prevent user from having to instantiate node-canvas instance. Add fabric.Canvas.prototype.createPNGStream which is a simple proxy for node-canvas createPNGStream.
|
2011-08-16 15:57:07 -04:00 |
|