Commit Graph

15 Commits

Author SHA1 Message Date
f0263c0bee 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
d596a93657 Adjusting copyright 2017-01-26 16:32:45 +01:00
7ec137c6cb Increase php version requirement 2016-12-07 20:56:15 +01:00
14804110a8 Prepare const visibility 2016-12-07 20:23:04 +01:00
01a1cadf5b Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
4f33b6e6da Usage of InfoManager 2016-04-02 17:47:30 +02:00
733394b86b Routings moved to routing files 2016-04-01 22:16:21 +02:00
3a95693a98 Cleanup and function pull out 2016-01-30 22:13:15 +01:00
86a13882c3 Remove namespace from scalars 2016-01-23 10:17:21 +01:00
8682b6e567 Test fixes 2016-01-23 10:10:24 +01:00
63484be991 Fix dependencies 2016-01-17 18:31:49 +01:00
b47a14ef1e Admin dependency added 2016-01-10 19:13:00 +01:00
6e484e2c77 Restructure 2015-12-31 18:05:19 +01:00
4478d1f424 Module version and path implemented 2015-12-29 18:38:45 +01:00
5a98f505fa Init 2015-11-29 21:57:18 +01:00