Commit Graph

10 Commits

Author SHA1 Message Date
ca5845d87d 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
76b80911c8 Adjusting copyright 2017-01-26 16:32:45 +01:00
29e9a92486 Added log view 2016-12-30 20:40:17 +01:00
c2dfbacbda Increase php version requirement 2016-12-07 20:56:15 +01:00
b578b1db9e Localization fix 2016-07-27 22:20:30 +02:00
7609491375 Translation fixes (0 still missing) 2016-07-27 13:17:50 +02:00
8e532ea83b Dynamic language loading 2016-07-05 19:00:30 +02:00
08468a49be Language display optimized
see previous commit
2016-07-02 14:15:02 +02:00
3e7f9acf08 Simplyfing layout 2016-05-17 20:14:04 +02:00
9209b187f4 Case fix! 2016-03-26 18:59:38 +01:00