Commit Graph

17 Commits

Author SHA1 Message Date
48ed64a02f 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
8f569642a3 Adjusting copyright 2017-01-26 16:32:45 +01:00
b68b183bc6 Increase php version requirement 2016-12-07 20:56:15 +01:00
d683877e9f Prepare const visibility 2016-12-07 20:23:04 +01:00
7b0574b4c5 Making datamapper static 2016-05-14 14:58:33 +02:00
b6d6ea716e Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
a22fe2714b Usage of InfoManager 2016-04-02 17:47:30 +02:00
4114f2e436 Routings moved to routing files 2016-04-01 22:16:21 +02:00
f3311a5e06 Templating 2016-02-11 21:10:18 +01:00
ec41bc8cc2 Cleanup and function pull out 2016-01-30 22:13:15 +01:00
a76e1ed46e Remove namespace from scalars 2016-01-23 10:17:21 +01:00
04133e8d55 Test fixes 2016-01-23 10:10:24 +01:00
e0400b1b24 Fix dependencies 2016-01-17 18:31:49 +01:00
64d689650b Admin dependency added 2016-01-10 19:13:00 +01:00
54292bb6fb Restructure 2015-12-31 18:05:19 +01:00
8ac36b236a Module version and path implemented 2015-12-29 18:38:45 +01:00
e476151784 Init 2015-11-29 21:57:18 +01:00