d0f6a2b2c0
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
8c41124c07
Adjusting copyright
2017-01-26 16:32:45 +01:00
7c37cbef22
Increase php version requirement
2016-12-07 20:56:15 +01:00
4f37c7f422
Translation fixes (0 still missing)
2016-07-27 13:15:05 +02:00
15fabe8f58
Dynamic language loading
2016-07-05 19:00:30 +02:00
f55c1934f6
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
aafab48773
Init
2015-11-29 21:57:18 +01:00
