Commit Graph

63 Commits

Author SHA1 Message Date
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
b30199517a Translation fixes (0 still missing) 2016-07-27 13:17:50 +02:00
06bcbc3631 Implemented application routes 2016-07-22 00:15:26 +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
fc152f87a9 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
ba9613e26f Simplyfing layout 2016-05-17 20:14:04 +02:00
cfebfe56ec Fixing remaining bugs for route-restructure 2016-04-09 10:43:09 +02:00
d2152236f5 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
e9d4968b26 Case fix! 2016-03-26 18:59:38 +01:00