Commit Graph

15 Commits

Author SHA1 Message Date
d4b4962726 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
0da6628455 Adjusting copyright 2017-01-26 16:32:45 +01:00
7c3531dbf3 Increase php version requirement 2016-12-07 20:56:15 +01:00
c49963bd9c Prepare const visibility 2016-12-07 20:23:04 +01:00
03e01233d7 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
42a02599bc Usage of InfoManager 2016-04-02 17:47:30 +02:00
c50cea5726 Routings moved to routing files 2016-04-01 22:16:21 +02:00
f523515a04 Cleanup and function pull out 2016-01-30 22:13:15 +01:00
1d25ef070c Remove namespace from scalars 2016-01-23 10:17:21 +01:00
fc7439f3ed Test fixes 2016-01-23 10:10:24 +01:00
ca674ccf8c Fix dependencies 2016-01-17 18:31:49 +01:00
ad001ef775 Admin dependency added 2016-01-10 19:13:00 +01:00
fa350c344d Restructure 2015-12-31 18:05:19 +01:00
bc00ab1146 Module version and path implemented 2015-12-29 18:38:45 +01:00
0f28b9e7d6 Init 2015-11-29 21:57:18 +01:00