Commit Graph

15 Commits

Author SHA1 Message Date
863cf9348d 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
8bb7d0377b Adjusting copyright 2017-01-26 16:32:45 +01:00
6e42eb46de Increase php version requirement 2016-12-07 20:56:15 +01:00
6838a01325 Prepare const visibility 2016-12-07 20:23:04 +01:00
d2152236f5 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
742f940ad8 Usage of InfoManager 2016-04-02 17:47:30 +02:00
a00c7a2822 Routings moved to routing files 2016-04-01 22:16:21 +02:00
0b35b4cdf5 Cleanup and function pull out 2016-01-30 22:13:15 +01:00
ba4efc4df8 Remove namespace from scalars 2016-01-23 10:17:21 +01:00
d8872b6512 Test fixes 2016-01-23 10:10:24 +01:00
7f3ff3ef7f Fix dependencies 2016-01-17 18:31:49 +01:00
8a2f64f4ad Admin dependency added 2016-01-10 19:13:00 +01:00
502874886e Restructure 2015-12-31 18:05:19 +01:00
39bfd3b672 Module version and path implemented 2015-12-29 18:38:45 +01:00
694aee1200 Init 2015-11-29 21:57:18 +01:00