|
|
4a95f90207
|
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 |
|
|
|
1c5b097be4
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
b9c1cc4857
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
b61201ed58
|
Localization fix
|
2016-07-27 22:20:30 +02:00 |
|
|
|
c93f2f34aa
|
Translation fixes (0 still missing)
|
2016-07-27 13:15:05 +02:00 |
|
|
|
ca529f832f
|
Dynamic language loading
|
2016-07-05 19:00:30 +02:00 |
|
|
|
149564d63a
|
Language display optimized
see previous commit
|
2016-07-02 14:15:02 +02:00 |
|
|
|
537b9291ab
|
Fixing upload bugs
|
2016-05-25 22:52:49 +02:00 |
|
|
|
4557f2a0f8
|
Directory rename
|
2016-05-19 19:46:39 +02:00 |
|
|
|
93387702f0
|
Partially fixing media upload by fixing routs and associated methods.
|
2015-12-20 22:31:57 +01:00 |
|
|
|
b68fc816ee
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
