Commit Graph

12 Commits

Author SHA1 Message Date
69767861c9 Flexbox tpl implementation 2017-01-29 13:43:20 +01:00
daa39bfc89 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
e254aef924 Adjusting copyright 2017-01-26 16:32:45 +01:00
49f480f59a Increase php version requirement 2016-12-07 20:56:15 +01:00
2f379c222d Core adjustments for pending issues 2016-10-02 12:07:05 +02:00
0aba90fd59 Localization fix 2016-07-27 22:20:30 +02:00
422d01d6c7 Translation fixes (0 still missing) 2016-07-27 13:15:05 +02:00
2e8d03dd06 Dynamic language loading 2016-07-05 19:00:30 +02:00
44dd0c5d17 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
006d9ed48c Templating 2016-06-25 13:57:53 +02:00
e719702cd0 Directory rename 2016-05-19 19:46:39 +02:00
b53e7115e3 Init 2015-11-29 21:57:18 +01:00