Commit Graph

13 Commits

Author SHA1 Message Date
265f38f5c2 Auto adjust image/canvas size to image 2017-02-08 18:14:53 +01:00
1aa533428d Init canvas from image 2017-02-04 16:47:45 +01:00
86f5c45654 Adjust paths and resize 2017-01-27 23:21:16 +01:00
3dce57e942 Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
#	Draw/Controller.js
#	Draw/Models/DrawType.enum.js
#	Draw/Models/Editor.js
#	Media/Models/UploadFile.php
2017-01-26 16:42:29 +01:00
23204c884c Make es6 adjustments 2017-01-26 16:34:34 +01:00
1823c98f30 Fixing json serialization and reporter 2017-01-22 21:08:46 +01:00
1d8f4fe292 Increase php version requirement 2016-12-07 20:56:15 +01:00
baf4c5dd17 [Draw] working mini draft 2016-11-23 23:48:27 +01:00
6bdc90c65e Fixing draw and drafting create 2016-11-09 21:14:16 +01:00
73db2a96aa Use strict 2016-07-05 18:11:33 +02:00
a49ae97b33 Removing unused parameter 2016-06-04 18:32:53 +02:00
4663d023f2 Inspection fixes 2015-12-22 23:15:38 +01:00
6462260d5a Split 2015-12-18 17:43:42 +01:00