Commit Graph

11 Commits

Author SHA1 Message Date
e7cd095375 Implement & bug fixes 2017-02-12 16:02:17 +01:00
a45ada8f5d Fix installation/mapper 2017-02-12 10:33:37 +01:00
d298815613 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
732f595d8a Adjusting copyright 2017-01-26 16:32:45 +01:00
723f9a1af1 Increase php version requirement 2016-12-07 20:56:15 +01:00
6e749c489e Fixing doc blocks 2016-11-06 22:22:07 +01:00
d37db29c10 Core adjustments for pending issues 2016-10-02 12:07:05 +02:00
f450ba4850 Fixing comments and parameter for orm 2016-05-14 16:23:17 +02:00
93a21d9925 Making datamapper static 2016-05-14 14:58:33 +02:00
d8cf1b0096 Unit test bug fixes 2016-04-24 20:47:29 +02:00
0bffa7f0bc Draft ProjectManagement and EventManagement models 2016-03-13 00:14:39 +01:00