Commit Graph

8 Commits

Author SHA1 Message Date
daa39bfc89 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
e254aef924 Adjusting copyright 2017-01-26 16:32:45 +01:00
49f480f59a Increase php version requirement 2016-12-07 20:56:15 +01:00
26afb1aae2 Adjust database pool name 2016-10-29 20:44:52 +02:00
90986cb1ac Fix info manager usage 2016-07-15 20:15:01 +02:00
1038dc56e3 Namespace fixes 2016-03-31 21:53:31 +02:00
e6f8466085 Restructure 2015-12-31 18:05:19 +01:00
884fedc2e8 New admin classes (activate, deactivate, uninstall, update) 2015-12-30 22:51:05 +01:00