|
|
863cf9348d
|
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 |
|
|
|
8bb7d0377b
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
6e42eb46de
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
f033f1bad2
|
Localization fix
|
2016-07-27 22:20:30 +02:00 |
|
|
|
013d42cfbc
|
Translation fixes (0 still missing)
|
2016-07-27 13:15:05 +02:00 |
|
|
|
aeefb410d2
|
Path fixes
|
2016-07-22 00:15:38 +02:00 |
|
|
|
1ae8c98f88
|
Dynamic language loading
|
2016-07-05 19:00:30 +02:00 |
|
|
|
67ef8ffdc6
|
Language fixes+api routes implemented
|
2016-07-02 20:02:27 +02:00 |
|
|
|
7e535b5845
|
Language display optimized
see previous commit
|
2016-07-02 14:15:02 +02:00 |
|
|
|
70e65d3cfd
|
Directory rename
|
2016-05-19 19:46:39 +02:00 |
|
|
|
694aee1200
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
