Commit Graph

25 Commits

Author SHA1 Message Date
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
16a04b81f7 Prepare const visibility 2016-12-07 20:23:04 +01:00
f0b4c471b3 Fixing templates 2016-12-07 18:59:40 +01:00
f967450cad Adjust database pool name 2016-10-29 20:44:52 +02:00
63914106d1 Fixing editor bugs 2016-10-23 21:49:16 +02:00
cf1f0b43be Fix install 2016-10-09 20:07:30 +02:00
c1b8b582d4 Core adjustments for pending issues 2016-10-02 12:07:05 +02:00
b1bb03f216 Routing 2016-07-05 11:35:20 +02:00
697af0cedb Making datamapper static 2016-05-14 14:58:33 +02:00
8e08dfa030 Reformatting and new directory (capitalization) 2016-05-06 18:24:44 +02:00
7ce67e7b7b Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
9f51c160da Usage of InfoManager 2016-04-02 17:47:30 +02:00
52c25f936b Routings moved to routing files 2016-04-01 22:16:21 +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
ab619f5a1d Test fixes 2016-01-23 10:10:24 +01:00
1c74306f91 Fix dependencies 2016-01-17 18:31:49 +01:00
5c817521d1 Admin dependency added 2016-01-10 19:13:00 +01:00
8cb65c8556 Documentation fix 2016-01-02 21:16:04 +01:00
b17e25c56e Restructure 2015-12-31 18:05:19 +01:00
38cd1b037b Module version and path implemented 2015-12-29 18:38:45 +01:00
133e8ad225 Init 2015-11-29 21:57:18 +01:00