Commit Graph

13 Commits

Author SHA1 Message Date
d0f6a2b2c0 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
8c41124c07 Adjusting copyright 2017-01-26 16:32:45 +01:00
7c37cbef22 Increase php version requirement 2016-12-07 20:56:15 +01:00
417166fa45 Prepare const visibility 2016-12-07 20:23:04 +01:00
50af0b1b02 Added splash navigation 2016-07-03 15:29:50 +02:00
965c7794ec Implementing basic activate/deactivate 2016-07-02 12:39:31 +02:00
538ff6b223 Cleanup and function pull out 2016-01-30 22:13:15 +01:00
e24df84e24 Remove namespace from scalars 2016-01-23 10:17:21 +01:00
31d69ab491 Fix dependencies 2016-01-17 18:31:49 +01:00
fedd6b45db Admin dependency added 2016-01-10 19:13:00 +01:00
64ef1614e5 Restructure 2015-12-31 18:05:19 +01:00
363b83b7d3 Module version and path implemented 2015-12-29 18:38:45 +01:00
aafab48773 Init 2015-11-29 21:57:18 +01:00