Commit Graph

12 Commits

Author SHA1 Message Date
3a4fdced2b 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
697294b655 Adjusting copyright 2017-01-26 16:32:45 +01:00
3ccfaf607a Increase php version requirement 2016-12-07 20:56:15 +01:00
3c4fe4836c Adjust database pool name 2016-10-29 20:44:52 +02:00
240d7ff853 Fix install 2016-10-09 20:07:30 +02:00
1675e6f827 Core adjustments for pending issues 2016-10-02 12:07:05 +02:00
d297ff9607 Added localization table 2016-07-21 17:55:20 +02:00
3741fa54fe Unit test fixes 2016-04-22 17:44:28 +02:00
d8bde155a3 Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
7ceedface8 Usage of InfoManager 2016-04-02 17:47:30 +02:00
22d50dbe6e Organization + calendar fixes/extensions 2016-02-14 23:10:58 +01:00
d9badeada7 Init 2015-11-29 21:57:18 +01:00