Commit Graph

13 Commits

Author SHA1 Message Date
055c19ab2f More flexbox implementations 2017-01-29 12:35:25 +01:00
164c44922e 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
e98a972f58 Adjusting copyright 2017-01-26 16:32:45 +01:00
074d2c82ba Template, comment and path fixes 2016-12-30 19:59:24 +01:00
e3593e2db1 Increase php version requirement 2016-12-07 20:56:15 +01:00
98c1b5d50a [Editor] Create working draft 2016-11-23 23:48:57 +01:00
835fa99d54 Preparing editor CRUD 2016-11-09 21:14:37 +01:00
96a32a2cd3 Localization fix 2016-07-27 22:20:30 +02:00
6a0a439e65 Translation fixes (0 still missing) 2016-07-27 13:15:05 +02:00
c06fbf93c8 Dynamic language loading 2016-07-05 19:00:30 +02:00
1bab9ba524 Language display optimized
see previous commit
2016-07-02 14:15:02 +02:00
7fea385501 Directory rename 2016-05-19 19:46:39 +02:00
f2d0afaeef Split 2015-12-18 17:43:42 +01:00