Commit Graph

12 Commits

Author SHA1 Message Date
d891e510b2 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
2c657b21d7 Adjusting copyright 2017-01-26 16:32:45 +01:00
b28668bb5e Increase php version requirement 2016-12-07 20:56:15 +01:00
837039c69b Path fix 2016-10-17 22:00:24 +02:00
b43d94782a Localization fix 2016-07-27 22:20:30 +02:00
d94bb22d79 Translation fixes (0 still missing) 2016-07-27 13:15:05 +02:00
9b0bc9135c Dynamic language loading 2016-07-05 19:00:30 +02:00
5c62a8d11a Language display optimized
see previous commit
2016-07-02 14:15:02 +02:00
03311a5cf1 Simplyfing layout 2016-05-17 20:14:04 +02:00
ade4b2523c Removing required form element 2015-12-20 22:32:46 +01:00
d33147c79a Preparing lookup button 2015-12-19 10:06:15 +01:00
37219196d1 Init 2015-11-29 21:57:18 +01:00