|
|
dfaec66351
|
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 |
|
|
|
822220dada
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
24b8eb31fc
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
51c5c5ef58
|
[News] Added plain text
|
2016-11-23 23:49:41 +01:00 |
|
|
|
f967450cad
|
Adjust database pool name
|
2016-10-29 20:44:52 +02:00 |
|
|
|
cf1f0b43be
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
7ce67e7b7b
|
Fixing remaining bugs for route-restructure
|
2016-04-09 10:42:22 +02:00 |
|
|
|
9f51c160da
|
Usage of InfoManager
|
2016-04-02 17:47:30 +02:00 |
|
|
|
5b293282fa
|
Cleanup and function pull out
|
2016-01-30 22:13:15 +01:00 |
|
|
|
133e8ad225
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
