|
|
3e8838eb94
|
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 |
|
|
|
fb1dd8d15e
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
d53f224783
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
f16898b6b6
|
Fixing doc blocks
|
2016-11-06 22:22:07 +01:00 |
|
|
|
379afce9d3
|
Core adjustments for pending issues
|
2016-10-02 12:07:05 +02:00 |
|
|
|
2820eb98ae
|
Fixing comments and parameter for orm
|
2016-05-14 16:23:17 +02:00 |
|
|
|
ddb4ccc620
|
Making datamapper static
|
2016-05-14 14:58:33 +02:00 |
|
|
|
478c0cf2e5
|
Unit test bug fixes
|
2016-04-24 20:47:29 +02:00 |
|
|
|
70e342fa06
|
Draft ProjectManagement and EventManagement models
|
2016-03-13 00:14:39 +01:00 |
|
