Commit Graph

12 Commits

Author SHA1 Message Date
96cd2fa136 More flexbox implementations 2017-01-29 19:59:42 +01:00
4abb40802e 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
eee5fcbd3e Adjusting copyright 2017-01-26 16:32:45 +01:00
422b1409ea Increase php version requirement 2016-12-07 20:56:15 +01:00
fc0da0a56c Translation fixes (0 still missing) 2016-07-27 13:15:05 +02:00
c2aa7b3c37 Remove static loading 2016-07-05 19:22:54 +02:00
b386fbe17c Dynamic language loading 2016-07-05 19:00:30 +02:00
aef111fa62 Templating 2016-07-03 15:30:25 +02:00
59bdb1876a 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
299f19a2f6 Directory rename 2016-05-19 19:46:39 +02:00
885a3f06d9 Templating 2015-12-19 19:35:25 +01:00
b9678adddc Init 2015-11-29 21:57:18 +01:00