|
|
80e26028ff
|
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 |
|
|
|
542f31a603
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
e60c9cc56c
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
2d137cb989
|
Localization fix
|
2016-07-27 22:20:30 +02:00 |
|
|
|
77cb2e7aaf
|
Translation fixes (0 still missing)
|
2016-07-27 13:15:05 +02:00 |
|
|
|
bc56205c30
|
Dynamic language loading
|
2016-07-05 19:00:30 +02:00 |
|
|
|
937e5bc77a
|
Language display optimized
see previous commit
|
2016-07-02 14:15:02 +02:00 |
|
|
|
ddd7ba9b75
|
Directory rename
|
2016-05-19 19:46:39 +02:00 |
|
|
|
9fd2b32107
|
Templating
|
2015-12-19 19:35:25 +01:00 |
|
