Commit Graph

7 Commits

Author SHA1 Message Date
286a9c24fe 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
f0687e8e6c Adjusting copyright 2017-01-26 16:32:45 +01:00
e085879851 Increase php version requirement 2016-12-07 20:56:15 +01:00
762007922f Remove static loading 2016-07-05 19:22:54 +02:00
0b5d967581 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
9a27c8bfba Implementing new schedule class/table. Schedule can be used for many other modules and objects. 2016-02-11 21:09:52 +01:00
08d71ddbe3 Restructure 2015-12-31 18:05:19 +01:00