|
|
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 |
|
|
|
3ee9bf99f6
|
Localization fix
|
2016-07-27 22:20:30 +02:00 |
|
|
|
688b23fbf6
|
Translation fixes (0 still missing)
|
2016-07-27 13:15:05 +02:00 |
|
|
|
eb7b8125f8
|
Dynamic language loading
|
2016-07-05 19:00:30 +02:00 |
|
|
|
dc34dee484
|
Language display optimized
see previous commit
|
2016-07-02 14:15:02 +02:00 |
|
|
|
fd9d4363b4
|
Directory rename
|
2016-05-19 19:46:39 +02:00 |
|
|
|
0f28b9e7d6
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
