Commit Graph

10 Commits

Author SHA1 Message Date
d0f6a2b2c0 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
8c41124c07 Adjusting copyright 2017-01-26 16:32:45 +01:00
7c37cbef22 Increase php version requirement 2016-12-07 20:56:15 +01:00
7beb497b58 Adjust database pool name 2016-10-29 20:44:52 +02:00
356d438137 Fix install 2016-10-09 20:07:30 +02:00
3dcafaf62e Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
a28838584b Usage of InfoManager 2016-04-02 17:47:30 +02:00
e24df84e24 Remove namespace from scalars 2016-01-23 10:17:21 +01:00
7d51c2760c Renamin navigation install files 2015-12-29 21:52:47 +01:00
aafab48773 Init 2015-11-29 21:57:18 +01:00