Commit Graph

18 Commits

Author SHA1 Message Date
164c44922e 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
e98a972f58 Adjusting copyright 2017-01-26 16:32:45 +01:00
e3593e2db1 Increase php version requirement 2016-12-07 20:56:15 +01:00
3bc192bc5b Prepare const visibility 2016-12-07 20:23:04 +01:00
98c1b5d50a [Editor] Create working draft 2016-11-23 23:48:57 +01:00
835fa99d54 Preparing editor CRUD 2016-11-09 21:14:37 +01:00
c1c50bc0d2 Fixing return type and head access 2016-06-24 19:49:15 +02:00
b308c1e032 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
0bf784b050 Usage of InfoManager 2016-04-02 17:47:30 +02:00
fc51c7a9f2 Routings moved to routing files 2016-04-01 22:16:21 +02:00
118df08308 Cleanup and function pull out 2016-01-30 22:13:15 +01:00
a3eb27c73f Remove namespace from scalars 2016-01-23 10:17:21 +01:00
67e92eccc4 Test fixes 2016-01-23 10:10:24 +01:00
7b7108a325 Fix dependencies 2016-01-17 18:31:49 +01:00
8af2cb20d1 Admin dependency added 2016-01-10 19:13:00 +01:00
96a3db94b6 Restructure 2015-12-31 18:05:19 +01:00
228ead5bac Module version and path implemented 2015-12-29 18:38:45 +01:00
f2d0afaeef Split 2015-12-18 17:43:42 +01:00