Johannes Meyer 11063495b2 Merge branch 'master' into bugfix/rebuild-form-builder-5525 ...

Conflicts:
	modules/monitoring/application/controllers/ConfigController.php

2014-08-21 10:22:16 +02:00

..

createbackend.phtml

Adjust createbackend-action to suit the new backend form interface

2014-07-25 15:58:44 +02:00

createinstance.phtml

Merge EditInstanceForm with CreateInstanceForm and rename it

2014-08-11 14:49:42 +02:00

editbackend.phtml

Adjust editbackend-action to suit the new backend-form interface

2014-07-25 14:55:36 +02:00

editinstance.phtml

Merge EditInstanceForm with CreateInstanceForm and rename it

2014-08-11 14:49:42 +02:00

index.phtml

Handle not readable monitoring config files more intelligent

2014-03-13 15:54:27 +01:00

removebackend.phtml

Adjust removebackend-action to suit the new backend form interface

2014-07-25 16:00:38 +02:00

removeinstance.phtml

Merge EditInstanceForm with CreateInstanceForm and rename it

2014-08-11 14:49:42 +02:00

security.phtml

Remove '{{SAVE_ICON}}', tiny design fixes

2014-08-19 17:54:22 +02:00

show-configuration.phtml

Small view changes

2014-03-12 11:22:20 +01:00