Commit Graph

15 Commits

Author SHA1 Message Date
ca5845d87d 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
76b80911c8 Adjusting copyright 2017-01-26 16:32:45 +01:00
c2dfbacbda Increase php version requirement 2016-12-07 20:56:15 +01:00
f37b3da278 Prepare const visibility 2016-12-07 20:23:04 +01:00
014e9c4c11 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
49e94e2244 Usage of InfoManager 2016-04-02 17:47:30 +02:00
4d525698b7 Routings moved to routing files 2016-04-01 22:16:21 +02:00
e49c6d74b0 Cleanup and function pull out 2016-01-30 22:13:15 +01:00
0ef4dcee6c Remove namespace from scalars 2016-01-23 10:17:21 +01:00
8ad858eeab Test fixes 2016-01-23 10:10:24 +01:00
1a6cc023b2 Fix dependencies 2016-01-17 18:31:49 +01:00
ecce75a61f Admin dependency added 2016-01-10 19:13:00 +01:00
69a2b4a111 Restructure 2015-12-31 18:05:19 +01:00
c18731028d Module version and path implemented 2015-12-29 18:38:45 +01:00
9b7500858a Init 2015-11-29 21:57:18 +01:00