Commit Graph

8 Commits

Author SHA1 Message Date
8a031bdca1 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
cf73d7b282 Adjusting copyright 2017-01-26 16:32:45 +01:00
9247f190ab Increase php version requirement 2016-12-07 20:56:15 +01:00
aa3b0698e1 Adjust database pool name 2016-10-29 20:44:52 +02:00
80b2689bbd Usage of InfoManager 2016-04-02 17:47:30 +02:00
b60e2e39cc Fixing uninstall and removing old modules 2016-01-16 19:20:55 +01:00
d90c25bc91 Restructure 2015-12-31 18:05:19 +01:00
5c17c15535 New admin classes (activate, deactivate, uninstall, update) 2015-12-30 22:51:05 +01:00