|
|
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 |
|
|
|
8a7bb12586
|
Fixing json serialization and reporter
|
2017-01-22 21:08:46 +01:00 |
|
|
|
4c0fc1ec38
|
Template, comment and path fixes
|
2016-12-30 19:59:24 +01:00 |
|
|
|
3ccfaf607a
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
52f10e736c
|
Fixing doc blocks
|
2016-11-06 22:22:07 +01:00 |
|
|
|
befbe5dc3e
|
Rest changes
|
2016-06-11 20:25:55 +02:00 |
|
|
|
7473f1b4d7
|
Making datamapper static
|
2016-05-14 14:58:33 +02:00 |
|
|
|
22d50dbe6e
|
Organization + calendar fixes/extensions
|
2016-02-14 23:10:58 +01:00 |
|
|
|
fc2d78e384
|
Remove namespace from scalars
|
2016-01-23 10:17:21 +01:00 |
|
|
|
d9badeada7
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
