|
|
2de2b27a1c
|
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 |
|
|
|
7fb00b9d4e
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
4ae2510846
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
50991ef655
|
Fixing doc blocks
|
2016-11-06 22:22:07 +01:00 |
|
|
|
856fb3bf2e
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# Tasks/Admin/Routes/Web/Api.php
|
2016-10-02 12:10:19 +02:00 |
|
|
|
9500ba9f76
|
Core adjustments for pending issues
|
2016-10-02 12:07:05 +02:00 |
|
|
|
2876f490f8
|
Preparing for query extension
implementing media for task/task elements and preparing for unit parent
display.
|
2016-09-28 22:07:54 +02:00 |
|
|
|
ae336cfe4a
|
Organization + calendar fixes/extensions
|
2016-02-14 23:10:58 +01:00 |
|
