Commit Graph

16 Commits

Author SHA1 Message Date
d891e510b2 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
2c657b21d7 Adjusting copyright 2017-01-26 16:32:45 +01:00
b28668bb5e Increase php version requirement 2016-12-07 20:56:15 +01:00
f34eafc55a Prepare const visibility 2016-12-07 20:23:04 +01:00
02dc3ad248 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
c09f12f907 Usage of InfoManager 2016-04-02 17:47:30 +02:00
2fb9874afd Routings moved to routing files 2016-04-01 22:16:21 +02:00
1d7a86a936 Cleanup and function pull out 2016-01-30 22:13:15 +01:00
9e061d643f Remove namespace from scalars 2016-01-23 10:17:21 +01:00
4a05dd6071 Test fixes 2016-01-23 10:10:24 +01:00
525043da01 Fix dependencies 2016-01-17 18:31:49 +01:00
fde8f971fe Admin dependency added 2016-01-10 19:13:00 +01:00
c5e5efceef Restructure 2015-12-31 18:05:19 +01:00
5465a13fd2 Module version and path implemented 2015-12-29 18:38:45 +01:00
e8b53ec982 Templating 2015-12-19 19:35:25 +01:00
37219196d1 Init 2015-11-29 21:57:18 +01:00