|
|
dfaec66351
|
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 |
|
|
|
822220dada
|
Adjusting copyright
|
2017-01-26 16:32:45 +01:00 |
|
|
|
24b8eb31fc
|
Increase php version requirement
|
2016-12-07 20:56:15 +01:00 |
|
|
|
51c5c5ef58
|
[News] Added plain text
|
2016-11-23 23:49:41 +01:00 |
|
|
|
6014a13e4a
|
Fixing doc blocks
|
2016-11-06 22:22:07 +01:00 |
|
|
|
c1b8b582d4
|
Core adjustments for pending issues
|
2016-10-02 12:07:05 +02:00 |
|
|
|
7a0d6c887a
|
Fixing comments and parameter for orm
|
2016-05-14 16:23:17 +02:00 |
|
|
|
697af0cedb
|
Making datamapper static
|
2016-05-14 14:58:33 +02:00 |
|
|
|
7a4ec7af7d
|
Organization + calendar fixes/extensions
|
2016-02-14 23:10:58 +01:00 |
|
|
|
5b293282fa
|
Cleanup and function pull out
|
2016-01-30 22:13:15 +01:00 |
|
|
|
a9a95d3dd2
|
Remove namespace from scalars
|
2016-01-23 10:17:21 +01:00 |
|
|
|
b17e25c56e
|
Restructure
|
2015-12-31 18:05:19 +01:00 |
|
|
|
133e8ad225
|
Init
|
2015-11-29 21:57:18 +01:00 |
|
