Commit Graph

19 Commits

Author SHA1 Message Date
4abb40802e 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
eee5fcbd3e Adjusting copyright 2017-01-26 16:32:45 +01:00
422b1409ea Increase php version requirement 2016-12-07 20:56:15 +01:00
5b97d69364 Adjust database pool name 2016-10-29 20:44:52 +02:00
cceb7d014c Fix install 2016-10-09 20:07:30 +02:00
e9c2ca6e02 Implemented application routes 2016-07-22 00:15:26 +02:00
17ebf29bf5 Implementing basic activate/deactivate 2016-07-02 12:39:31 +02:00
60019a64ad Fixing remaining bugs for route-restructure 2016-04-09 10:42:22 +02:00
496af6dc83 Usage of InfoManager 2016-04-02 17:47:30 +02:00
22187fb42c Routes files 2016-04-02 16:24:59 +02:00
8034049ea6 Routings moved to routing files 2016-04-01 22:16:21 +02:00
f2fb841144 Namespace fixes 2016-03-31 21:53:31 +02:00
247df0c7aa Fixing uninstall and removing old modules 2016-01-16 19:20:55 +01:00
5bda177fdd Templating 2016-01-09 19:46:27 +01:00
be3c1b9aa5 Restructure 2015-12-31 18:05:19 +01:00
3d6ee61371 New admin classes (activate, deactivate, uninstall, update) 2015-12-30 22:51:05 +01:00
ff1ba6aa71 Renamin navigation install files 2015-12-29 21:52:47 +01:00
885a3f06d9 Templating 2015-12-19 19:35:25 +01:00
b9678adddc Init 2015-11-29 21:57:18 +01:00