Commit Graph

11 Commits

Author SHA1 Message Date
77a44ebb1b Admin tpl flexbox implementation 2017-01-28 19:56:03 +01:00
3a4fdced2b 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
697294b655 Adjusting copyright 2017-01-26 16:32:45 +01:00
3ccfaf607a Increase php version requirement 2016-12-07 20:56:15 +01:00
e2f81eb07a Localization fix 2016-10-17 22:00:09 +02:00
00a2a040a5 Translation fixes (0 still missing) 2016-07-27 13:15:05 +02:00
5c1153039a Dynamic language loading 2016-07-05 19:00:30 +02:00
1ee8a163a8 Language display optimized
see previous commit
2016-07-02 14:15:02 +02:00
0ed5f2b473 Implementing basic activate/deactivate 2016-07-02 12:39:31 +02:00
0843a87a1b Directory rename 2016-05-19 19:46:39 +02:00
d9badeada7 Init 2015-11-29 21:57:18 +01:00