Commit Graph

20 Commits

Author SHA1 Message Date
1aa533428d Init canvas from image 2017-02-04 16:47:45 +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
3a43f30c97 Adjusting copyright 2017-01-26 16:32:45 +01:00
1d8f4fe292 Increase php version requirement 2016-12-07 20:56:15 +01:00
91f6d3e1c8 Prepare const visibility 2016-12-07 20:23:04 +01:00
1bef41c522 Fixing templates 2016-12-07 18:59:40 +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
e664e2d0b5 Fixing bugs 2016-05-15 23:24:43 +02:00
aafe876972 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
956aebdbcb Usage of InfoManager 2016-04-02 17:47:30 +02:00
b756593a85 Routings moved to routing files 2016-04-01 22:16:21 +02:00
f11bdfe96b Cleanup and function pull out 2016-01-30 22:13:15 +01:00
c2eb1ba1e9 Remove namespace from scalars 2016-01-23 10:17:21 +01:00
1035af0b9f Test fixes 2016-01-23 10:10:24 +01:00
2542e30ed2 Fix dependencies 2016-01-17 18:31:49 +01:00
7a9fcdde13 Admin dependency added 2016-01-10 19:13:00 +01:00
facec188e3 Restructure 2015-12-31 18:05:19 +01:00
843090d339 Module version and path implemented 2015-12-29 18:38:45 +01:00
6462260d5a Split 2015-12-18 17:43:42 +01:00