Commit Graph

14 Commits

Author SHA1 Message Date
d891e510b2 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
2c657b21d7 Adjusting copyright 2017-01-26 16:32:45 +01:00
fb063a5a73 Template, comment and path fixes 2016-12-30 19:59:24 +01:00
b28668bb5e Increase php version requirement 2016-12-07 20:56:15 +01:00
33566cd927 Localization fix 2016-10-17 22:00:09 +02:00
b43d94782a Localization fix 2016-07-27 22:20:30 +02:00
f9f95d12c9 Translation fixes (0 still missing) 2016-07-27 13:17:50 +02:00
9b0bc9135c Dynamic language loading 2016-07-05 19:00:30 +02:00
d49c18c19c 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
202721afb3 Directory rename 2016-05-19 19:46:39 +02:00
03311a5cf1 Simplyfing layout 2016-05-17 20:14:04 +02:00
a640145b32 Fixing remaining bugs for route-restructure 2016-04-09 10:43:09 +02:00
02dc3ad248 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
7edbd2167e Case fix! 2016-03-26 18:59:38 +01:00