Commit Graph

15 Commits

Author SHA1 Message Date
56a5329850 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
bc2fea8c65 Adjusting copyright 2017-01-26 16:32:45 +01:00
4c51373297 Added log view 2016-12-30 20:40:17 +01:00
137fd22f7c Increase php version requirement 2016-12-07 20:56:15 +01:00
6c06ccb739 Localization fix 2016-07-27 22:20:30 +02:00
7884ce754b Translation fixes (0 still missing) 2016-07-27 13:15:05 +02:00
a154d564c2 Dynamic language loading 2016-07-05 19:00:30 +02:00
b8ce9b6d24 Language display optimized
see previous commit
2016-07-02 14:15:02 +02:00
0d98919270 Directory rename 2016-05-19 19:46:39 +02:00
a13eb11c25 Fixing remaining bugs for route-restructure 2016-04-09 10:43:09 +02:00
468d935645 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
0eaec886d4 Restructure 2015-12-31 18:05:19 +01:00
635f898b8e Templating 2015-12-19 19:35:25 +01:00
4089198aed Preparing lookup button 2015-12-19 10:06:15 +01:00
9b0d1252c6 Init 2015-11-29 21:57:18 +01:00