Commit Graph

18 Commits

Author SHA1 Message Date
1e5c8f807c Fix empty task elements 2017-02-12 21:32:29 +01:00
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
a9b2812323 Fixing doc blocks 2016-11-06 22:22:07 +01:00
473dafdbcf Implement create and get 2016-11-05 21:48:14 +01: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
13197e4f41 Minor fixes and additions 2016-07-12 17:16:00 +02:00
b83d27d19a Update hard drive failure 2016-03-01 19:14:32 +01:00
ed7b69c0d2 Tasks doc comments 2016-02-11 22:31:42 +01:00
da1fa7f921 Implementing new schedule class/table. Schedule can be used for many other modules and objects. 2016-02-11 21:09:52 +01: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