d4b4962726
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
0da6628455
Adjusting copyright
2017-01-26 16:32:45 +01:00
7c3531dbf3
Increase php version requirement
2016-12-07 20:56:15 +01:00
6125dc0fce
Translation fixes (0 still missing)
2016-07-27 13:17:50 +02:00
eb7b8125f8
Dynamic language loading
2016-07-05 19:00:30 +02:00
7a16138b2d
Language display optimized
...
Language is now no longer direct array access but provided through a
function. This can be later used to hot load language files instead of
pre-loading them.
2016-07-02 14:14:31 +02:00
a3c8350cb3
Simplyfing layout
2016-05-17 20:14:04 +02:00
7ff9bf14a3
Case fix!
2016-03-26 18:59:38 +01:00
