Commit Graph

11 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
074d2c82ba Template, comment and path fixes 2016-12-30 19:59:24 +01:00
e3593e2db1 Increase php version requirement 2016-12-07 20:56:15 +01:00
98c1b5d50a [Editor] Create working draft 2016-11-23 23:48:57 +01:00
f8ac6843e3 Implemented Editor/Comments install 2016-11-14 17:27:55 +01:00
51d8f85724 Adjust database pool name 2016-10-29 20:44:52 +02:00
8989ea0e80 Fix install 2016-10-09 20:07:30 +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
f2d0afaeef Split 2015-12-18 17:43:42 +01:00