Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
cliffparnitzky committed May 8, 2017
2 parents 38520a5 + 70f9dbb commit 89c2372
Show file tree
Hide file tree
Showing 15 changed files with 1,132 additions and 1,012 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
Contao Extension "Monitoring"
=============================

Version 1.8.0 (2017-05-xx)
--------------------------
- added response time recording (see #15)
- moved to own backend group
- added `MonitoringTestModel`

Version 1.7.2 (2016-10-25)
--------------------------
- Contao 3.5 ready
Expand Down
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ Install the extension via composer: [contao-monitoring/monitoring](https://packa

If you prefer to install it manually, download the latest release here: https://github.com/ContaoMonitoring/monitoring/releases

After installation update the database and define Monitoring specific values in the system settings.


Tracker
-------
Expand All @@ -44,6 +46,10 @@ This extension is dependent on the following extensions:

- [[menatwork/contao-multicolumnwizard]](https://packagist.org/packages/menatwork/contao-multicolumnwizard)

The following extensions are recommended:

- [[cliffparnitzky/backend-custom-startpage]](https://packagist.org/packages/cliffparnitzky/backend-custom-startpage): set Monitoring as default start page at login


Documentation
-------------
Expand Down
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,17 @@
"contao/core":">=3.2.0,<3.6",
"contao-community-alliance/composer-plugin":"~2.0"
},
"suggest" : {
"cliffparnitzky/backend-custom-startpage" : "Provides the possibility for each user to select an individual startpage in the backend."
},
"extra":{
"contao":{
"sources":{
"system/modules/Monitoring":"system/modules/Monitoring"
}
},
"branch-alias": {
"dev-master": "1.7.x-dev"
"dev-master": "1.8.x-dev"
}
}
}
Loading

0 comments on commit 89c2372

Please sign in to comment.