|
|
daa39bfc89
|
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 |
|
|
|
e254aef924
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
3f621643f6
|
Fixing json serialization and reporter
|
2017-01-22 21:08:46 +01:00 |
|
|
|
49f480f59a
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
0f769089cb
|
Create task elements
|
2016-11-08 13:06:43 +01:00 |
|
|
|
814f8f493d
|
Fix comments
|
2016-11-07 20:14:30 +01:00 |
|
|
|
0ad430d497
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
39b286af7b
|
Return is array and not an object
|
2016-02-06 18:18:23 +01:00 |
|
|
|
4ae3416d92
|
Cleanup and function pull out
|
2016-01-30 22:13:15 +01:00 |
|
|
|
11ec29fcdd
|
Unit test fixes
|
2016-01-28 20:44:38 +01:00 |
|
|
|
8d5d933339
|
Remove namespace from scalars
|
2016-01-23 10:17:21 +01:00 |
|
|
|
b53e7115e3
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
