|
|
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 |
|
|
|
49f480f59a
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
a9b2812323
|
Fixing doc blocks
|
2016-11-06 22:22:07 +01:00 |
|
|
|
0ad430d497
|
Fix install
|
2016-10-09 20:07:30 +02:00 |
|
|
|
38c31e4780
|
Preparing for query extension
implementing media for task/task elements and preparing for unit parent
display.
|
2016-09-28 22:07:54 +02:00 |
|
|
|
35f63b7f6f
|
Fixing comments and parameter for orm
|
2016-05-14 16:23:17 +02:00 |
|
|
|
fe86e00aa5
|
Making datamapper static
|
2016-05-14 14:58:33 +02:00 |
|
|
|
ed7b69c0d2
|
Tasks doc comments
|
2016-02-11 22:31:42 +01:00 |
|
|
|
39b286af7b
|
Return is array and not an object
|
2016-02-06 18:18:23 +01:00 |
|
|
|
792ce687d7
|
Unit test fixes
|
2016-02-04 21:10:48 +01:00 |
|
|
|
11ec29fcdd
|
Unit test fixes
|
2016-01-28 20:44:38 +01:00 |
|
|
|
b53e7115e3
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
