Commit Graph

12 Commits

Author SHA1 Message Date
dfaec66351 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
822220dada Adjusting copyright 2017-01-26 16:32:45 +01:00
24b8eb31fc Increase php version requirement 2016-12-07 20:56:15 +01:00
c1b8b582d4 Core adjustments for pending issues 2016-10-02 12:07:05 +02:00
ac22080aba Localization fix 2016-07-27 22:20:30 +02:00
265b77dec9 Translation fixes (0 still missing) 2016-07-27 13:17:50 +02:00
2b57caed74 Dynamic language loading 2016-07-05 19:00:30 +02:00
fd09b26911 Language fixes+api routes implemented 2016-07-02 20:02:27 +02:00
0ff0bf5713 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
447e3b5926 Simplyfing layout 2016-05-17 20:14:04 +02:00
8e08dfa030 Reformatting and new directory (capitalization) 2016-05-06 18:24:44 +02:00
803a48c9c3 Case fix! 2016-03-26 18:59:38 +01:00