Commit Graph

11 Commits

Author SHA1 Message Date
ca5845d87d 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
76b80911c8 Adjusting copyright 2017-01-26 16:32:45 +01:00
29e9a92486 Added log view 2016-12-30 20:40:17 +01:00
c2dfbacbda Increase php version requirement 2016-12-07 20:56:15 +01:00
b578b1db9e Localization fix 2016-07-27 22:20:30 +02:00
e20bd140ed Translation fixes (0 still missing) 2016-07-27 13:15:05 +02:00
8e532ea83b Dynamic language loading 2016-07-05 19:00:30 +02:00
d8a998c70d 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
ce7ffa27b4 Directory rename 2016-05-19 19:46:39 +02:00
c88360154d Preparing lookup button 2015-12-19 10:06:15 +01:00
9b7500858a Init 2015-11-29 21:57:18 +01:00