Matt D
|
a712764401
|
Syntax changes to meet code style
|
2016-03-23 21:50:43 +11:00 |
|
Matt D
|
da105e6237
|
Moved the padding code to a new StringUtils.js utility and made the export code use it
|
2016-03-23 21:32:22 +11:00 |
|
Matt D
|
e2b6f0776b
|
Added frame and layer id padding to splittedExport
|
2016-03-23 20:51:08 +11:00 |
|
Matt D
|
c7381b771f
|
Added sprite number padding to mergedExport
|
2016-03-23 20:45:35 +11:00 |
|
Julian Descottes
|
776cf1ec87
|
Merge pull request #426 from juliandescottes/greenkeeper-grunt-contrib-watch-1.0.0
Update grunt-contrib-watch to version 1.0.0 🚀
|
2016-03-13 22:45:50 -07:00 |
|
greenkeeperio-bot
|
5f49a68b62
|
chore(package): update grunt-contrib-watch to version 1.0.0
http://greenkeeper.io/
|
2016-03-12 23:20:38 +01:00 |
|
Julian Descottes
|
fc75334e48
|
Merge pull request #425 from juliandescottes/update-license-apache
Update license apache
|
2016-03-11 23:36:26 +01:00 |
|
Julian Descottes
|
fced9fa914
|
Update README.md
|
2016-03-11 23:35:48 +01:00 |
|
Julian Descottes
|
661c6fba7d
|
Update LICENSE
|
2016-03-11 23:32:24 +01:00 |
|
Julian Descottes
|
539d7c7870
|
Merge pull request #397 from GMartigny/issue_#348
Issue #348 : colorpicker showing on top of tooltip
|
2016-03-11 00:58:36 +01:00 |
|
GMartigny
|
14fde4f8a0
|
Multi-line title on color selector
|
2016-03-05 17:31:56 +01:00 |
|
GMartigny
|
7088d9aa33
|
Revert modifications after discussion
|
2016-03-05 17:23:25 +01:00 |
|
Julian Descottes
|
c907f47f5d
|
Merge pull request #418 from juliandescottes/greenkeeper-grunt-jscs-2.8.0
Update grunt-jscs to version 2.8.0 🚀
|
2016-03-05 14:54:32 +01:00 |
|
Julian Descottes
|
1aa6b61bee
|
Merge pull request #415 from juliandescottes/greenkeeper-load-grunt-tasks-3.4.1
Update load-grunt-tasks to version 3.4.1 🚀
|
2016-03-05 14:54:21 +01:00 |
|
Julian Descottes
|
3043bac82c
|
chore: update package.json dependencies (bulk)
|
2016-03-05 12:55:08 +01:00 |
|
Julian Descottes
|
fc1d23b3f5
|
Merge pull request #407 from juliandescottes/greenkeeper-grunt-contrib-jshint-1.0.0
Update grunt-contrib-jshint to version 1.0.0 🚀
|
2016-03-05 12:49:38 +01:00 |
|
Julian Descottes
|
f9b8a78396
|
Merge pull request #406 from juliandescottes/greenkeeper-grunt-contrib-clean-1.0.0
Update grunt-contrib-clean to version 1.0.0 🚀
|
2016-03-05 12:49:22 +01:00 |
|
greenkeeperio-bot
|
a965bb0908
|
chore(package): update grunt-jscs to version 2.8.0
http://greenkeeper.io/
|
2016-03-02 21:24:14 +01:00 |
|
greenkeeperio-bot
|
ba43c888be
|
chore(package): update load-grunt-tasks to version 3.4.1
http://greenkeeper.io/
|
2016-03-01 07:32:46 +01:00 |
|
greenkeeperio-bot
|
00ee251868
|
chore(package): update grunt-contrib-jshint to version 1.0.0
http://greenkeeper.io/
|
2016-02-17 01:47:37 +01:00 |
|
greenkeeperio-bot
|
bcb6c3aca9
|
chore(package): update grunt-contrib-clean to version 1.0.0
http://greenkeeper.io/
|
2016-02-15 22:52:53 +01:00 |
|
jdescottes
|
e79183812b
|
Merge branch 'greenkeeper-karma-0.13.21'
|
2016-02-13 08:25:06 +01:00 |
|
jdescottes
|
2058630768
|
Merge branch 'master' into greenkeeper-karma-0.13.21
Conflicts:
package.json
|
2016-02-13 08:21:53 +01:00 |
|
Julian Descottes
|
be8a87110d
|
Merge pull request #404 from juliandescottes/greenkeeper-karma-0.13.20
Update karma to version 0.13.20 🚀
|
2016-02-13 08:12:42 +01:00 |
|
greenkeeperio-bot
|
54342c16d1
|
chore(package): update karma to version 0.13.21
http://greenkeeper.io/
|
2016-02-12 23:38:29 +01:00 |
|
greenkeeperio-bot
|
dd2e55f65e
|
chore(package): update karma to version 0.13.20
http://greenkeeper.io/
|
2016-02-12 16:23:04 +01:00 |
|
Julian Descottes
|
e7c53dac38
|
Merge pull request #398 from juliandescottes/greenkeeper-grunt-spritesmith-6.3.0
Update grunt-spritesmith to version 6.3.0 🚀
|
2016-02-12 06:42:07 +01:00 |
|
Julian Descottes
|
ebe37a612f
|
Merge pull request #395 from juliandescottes/greenkeeper-grunt-contrib-uglify-0.11.1
Update grunt-contrib-uglify to version 0.11.1 🚀
|
2016-02-12 06:42:00 +01:00 |
|
Julian Descottes
|
ef7108a5e0
|
Merge pull request #400 from GMartigny/issue_#349
Issue #349 : Frame list slightly scroll on the right
|
2016-02-12 05:32:18 +01:00 |
|
Guillaume Martigny
|
fc9cb07be1
|
Revert to whole frame draggable
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
|
2016-02-04 15:33:49 +01:00 |
|
Julian Descottes
|
ae1f880473
|
Merge pull request #399 from GMartigny/issue_#350
Issue #350
|
2016-02-04 15:10:52 +01:00 |
|
Guillaume Martigny
|
eb02e713e2
|
improve the sortable widget with direction, tolerance and handle
fix CSS to prevent horizontal scroll
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
|
2016-02-04 11:53:08 +01:00 |
|
greenkeeperio-bot
|
ecc1444b76
|
chore(package): update grunt-spritesmith to version 6.3.0
http://greenkeeper.io/
|
2016-02-04 06:26:16 +01:00 |
|
Guillaume Martigny
|
4985dfacf3
|
put background-position-x and -y together for compatibility
resize a bit to align with container
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
|
2016-02-03 17:32:32 +01:00 |
|
Julian Descottes
|
365503d9b5
|
Merge pull request #396 from GMartigny/issue_#392
Issue #392 : Allow to close the options drawer with the escape key.
|
2016-02-03 15:57:43 +01:00 |
|
Guillaume Martigny
|
9bd3bf4adf
|
code formating
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
|
2016-02-03 14:17:12 +01:00 |
|
Guillaume Martigny
|
fb9c600b9f
|
fix #348
Add a proposition to replace the title attribute.
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
|
2016-02-03 12:45:44 +01:00 |
|
Guillaume Martigny
|
20ecfd431b
|
Merge issue_#392
|
2016-02-03 09:29:19 +01:00 |
|
Guillaume Martigny
|
5eb936d8c2
|
fix #392
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
|
2016-02-03 09:19:21 +01:00 |
|
greenkeeperio-bot
|
f72da81fa4
|
chore(package): update grunt-contrib-uglify to version 0.11.1
http://greenkeeper.io/
|
2016-02-02 17:46:20 +01:00 |
|
Guillaume Martigny
|
30b0e5e607
|
add Netbeans project folder
Signed-off-by:Guillaume Martigny <guillaume.martigny@gmail.com>
|
2016-02-02 16:39:57 +01:00 |
|
Julian Descottes
|
c55a81f29b
|
Merge pull request #393 from juliandescottes/greenkeeper-karma-jasmine-0.3.7
Update karma-jasmine to version 0.3.7 🚀
|
2016-02-01 13:01:45 +01:00 |
|
greenkeeperio-bot
|
0712e04c12
|
chore(package): update karma-jasmine to version 0.3.7
http://greenkeeper.io/
|
2016-02-01 12:19:03 +01:00 |
|
Smie Grin
|
3b6c5aa7a4
|
Sync upstream Jan 31 2016
|
2016-01-31 16:41:34 -07:00 |
|
Julian Descottes
|
d2ac600d7a
|
Merge pull request #390 from juliandescottes/greenkeeper-grunt-spritesmith-6.2.0
Update grunt-spritesmith to version 6.2.0 🚀
|
2016-01-30 14:20:59 +01:00 |
|
Julian Descottes
|
049faba83e
|
Merge pull request #391 from juliandescottes/greenkeeper-grunt-jscs-2.7.0
Update grunt-jscs to version 2.7.0 🚀
|
2016-01-30 14:20:32 +01:00 |
|
greenkeeperio-bot
|
cb5ece914e
|
chore(package): update grunt-jscs to version 2.7.0
http://greenkeeper.io/
|
2016-01-29 18:07:14 +01:00 |
|
greenkeeperio-bot
|
b90887b98c
|
chore(package): update grunt-spritesmith to version 6.2.0
http://greenkeeper.io/
|
2016-01-29 06:19:56 +01:00 |
|
Julian Descottes
|
cc62c5b3cb
|
chore : fix ShortcutServiceTest on macosx
|
2016-01-24 13:02:32 +01:00 |
|
Smie Grin
|
e8f6bcee63
|
Merge remote-tracking branch 'upstream/master'
|
2016-01-18 07:39:31 -07:00 |
|