|
|
d9fe7a618f
|
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 |
|
|
|
7428508d17
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
26e58684b5
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
a30efb7d0e
|
Fixing doc blocks
|
2016-11-06 22:22:07 +01:00 |
|
|
|
dad14c0034
|
Core adjustments for pending issues
|
2016-10-02 12:07:05 +02:00 |
|
|
|
9c219ca7c5
|
Unit test bug fixes
|
2016-04-24 20:47:29 +02:00 |
|
|
|
e81a1102f7
|
Unit test fixes
|
2016-04-22 17:44:28 +02:00 |
|
|
|
62fec13e3f
|
Doc + Mapper::class implementation
|
2016-03-09 23:11:51 +01:00 |
|
|
|
dea6bd0e2e
|
Employee preparation
|
2016-03-05 19:44:23 +01:00 |
|
|
|
b2e4070153
|
Started to implement employee model
|
2016-02-21 10:09:54 +01:00 |
|
