Commit Graph

16 Commits

Author SHA1 Message Date
4abb40802e 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
eee5fcbd3e Adjusting copyright 2017-01-26 16:32:45 +01:00
422b1409ea Increase php version requirement 2016-12-07 20:56:15 +01:00
2876b6b12a Prepare const visibility 2016-12-07 20:23:04 +01:00
60019a64ad Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
496af6dc83 Usage of InfoManager 2016-04-02 17:47:30 +02:00
8034049ea6 Routings moved to routing files 2016-04-01 22:16:21 +02:00
88e5821925 Cleanup and function pull out 2016-01-30 22:13:15 +01:00
af567aaa97 Remove namespace from scalars 2016-01-23 10:17:21 +01:00
c4f2c4422c Test fixes 2016-01-23 10:10:24 +01:00
d77e4ca4be Fix dependencies 2016-01-17 18:31:49 +01:00
578882c222 Admin dependency added 2016-01-10 19:13:00 +01:00
be3c1b9aa5 Restructure 2015-12-31 18:05:19 +01:00
8a5b6e32ca Module version and path implemented 2015-12-29 18:38:45 +01:00
885a3f06d9 Templating 2015-12-19 19:35:25 +01:00
b9678adddc Init 2015-11-29 21:57:18 +01:00