mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity
1,822 Commits 6 Branches 32 Tags 22 MiB
c5c8184ae3
Commit Graph

1822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Julian Descottes
01eb0cdb43 Merge pull request #384 from juliandescottes/greenkeeper-grunt-contrib-jshint-0.12.0 
Update grunt-contrib-jshint to version 0.12.0 🚀
 2016-01-18 00:35:20 +01:00
smiegrin
412067ad90 Introduces zooming towards/away from mouse 2016-01-17 16:30:21 -07:00
greenkeeperio-bot
857524dee4 chore(package): update grunt-contrib-jshint to version 0.12.0 
http://greenkeeper.io/
 2016-01-17 19:11:00 +01:00
jdescottes
73b165ef0c chore : fix jshint errors "thanks" to caret version range from grunt-contrib-jshint 2016-01-16 15:28:28 +01:00
jdescottes
cd8d5c0b52 Issue #383 : Use metaKey as ctrlKey for Move tool on OSX 2016-01-16 12:31:03 +01:00
Julian Descottes
01a0cb14fd Merge pull request #382 from juliandescottes/greenkeeper-grunt-spritesmith-6.1.1 
Update grunt-spritesmith to version 6.1.1 🚀
 2016-01-13 23:27:15 +01:00
jdescottes
4394e29db0 Merge branch 'master' into greenkeeper-grunt-spritesmith-6.1.1 2016-01-13 23:24:13 +01:00
Julian Descottes
4361992014 Merge pull request #378 from juliandescottes/greenkeeper-karma-phantomjs-launcher-0.2.3 
Update karma-phantomjs-launcher to version 0.2.3 🚀
 2016-01-13 23:23:12 +01:00
jdescottes
b46d882c18 Merge branch 'master' into greenkeeper-karma-phantomjs-launcher-0.2.3 
Conflicts:
	package.json
 2016-01-13 23:20:24 +01:00
jdescottes
00a162a22e Merge branch 'greenkeeper-karma-0.13.19' 2016-01-13 23:18:53 +01:00
jdescottes
af382401be Merge branch 'master' into greenkeeper-karma-0.13.19 
Conflicts:
	package.json
 2016-01-13 23:18:38 +01:00
jdescottes
aaaf824ad7 Merge branch 'greenkeeper-karma-0.13.18' 2016-01-13 23:05:10 +01:00
jdescottes
97690ce486 Merge branch 'master' into greenkeeper-karma-0.13.18 
Conflicts:
	package.json
 2016-01-13 23:04:51 +01:00
Julian Descottes
f58a54e2ea Merge pull request #377 from juliandescottes/greenkeeper-grunt-jscs-2.6.0 
Update grunt-jscs to version 2.6.0 🚀
 2016-01-13 23:03:35 +01:00
Julian Descottes
a2fce811dd Merge pull request #376 from juliandescottes/greenkeeper-karma-0.13.17 
Update karma to version 0.13.17 🚀
 2016-01-13 23:03:20 +01:00
jdescottes
42aefa6851 Merge branch 'greenkeeper-load-grunt-tasks-3.4.0' 2016-01-13 23:02:26 +01:00
jdescottes
31edd71c41 Merge branch 'master' into greenkeeper-load-grunt-tasks-3.4.0 
Conflicts:
	package.json
 2016-01-13 23:00:15 +01:00
greenkeeperio-bot
34bfe0668c chore(package): update grunt-spritesmith to version 6.1.1 
http://greenkeeper.io/
 2016-01-12 02:56:16 -08:00
greenkeeperio-bot
936991cefa chore(package): update karma to version 0.13.19 
http://greenkeeper.io/
 2016-01-05 16:57:32 -08:00
greenkeeperio-bot
f7112bb005 chore(package): update karma to version 0.13.18 
http://greenkeeper.io/
 2016-01-05 01:16:12 +01:00
greenkeeperio-bot
5369b31dbc chore(package): update karma-phantomjs-launcher to version 0.2.3 
http://greenkeeper.io/
 2016-01-04 23:54:38 +01:00