Skip to content

Commit df5ffb4

Browse files
Merge branch 'hotfix/1.8.1'
2 parents 7451a9e + 5281fd3 commit df5ffb4

8 files changed

Lines changed: 23 additions & 7 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
Contao Extension "Monitoring"
33
=============================
44

5+
Version 1.8.1 (2017-xx-xx)
6+
--------------------------
7+
- Contao 4 ready
8+
59
Version 1.8.0 (2017-05-09)
610
--------------------------
711
- added response time recording (see #15)

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ https://github.com/ContaoMonitoring/monitoring/issues
3535
Compatibility
3636
-------------
3737

38-
- min. Contao version: >= 3.2.0
39-
- max. Contao version: < 3.6.0
40-
38+
- Contao version >= 3.2.0 ... < 3.6.0
39+
- Contao version >= 4.4.0
4140

4241
Dependency
4342
----------

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
},
2424
"require":{
2525
"php":">=5.3",
26-
"contao/core":">=3.2.0,<3.6",
27-
"contao-community-alliance/composer-plugin":"~2.0"
26+
"contao/core-bundle":"~3.2 || ~4.4",
27+
"contao-community-alliance/composer-plugin":"~2.4 || ~3.0"
2828
},
2929
"suggest" : {
3030
"cliffparnitzky/backend-custom-startpage" : "Provides the possibility for each user to select an individual startpage in the backend."
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#tl_navigation .tl_level_1_group .group-ContaoMonitoring {
2+
background: url(icon_monitoring.svg) 3px 2px no-repeat;
3+
}
Lines changed: 5 additions & 0 deletions
Loading

system/modules/Monitoring/config/config.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@
4646
)
4747
));
4848

49+
// Load icon in Contao 4.4 backend
50+
if ('BE' === TL_MODE) {
51+
$GLOBALS['TL_CSS'][] = 'system/modules/Monitoring/assets/backend_svg.css';
52+
}
53+
4954
/**
5055
* Cron
5156
*/

system/modules/Monitoring/dca/tl_monitoring.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
'default' => '0',
255255
'inputType' => 'text',
256256
'eval' => array('tl_class'=>'w50', 'readonly'=>true, 'rgxp'=>'digit', 'doNotCopy'=>true),
257-
'sql' => "double unsigned NOT NULL default '0'"
257+
'sql' => "double NOT NULL default '0'" // see doctrine/dbal#1018
258258
),
259259
'disable' => array
260260
(

system/modules/Monitoring/dca/tl_monitoring_test.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
'sorting' => true,
171171
'inputType' => 'text',
172172
'eval' => array('tl_class'=>'w50', 'readonly'=>true, 'rgxp'=>'digit'),
173-
'sql' => "double unsigned NOT NULL default '0'"
173+
'sql' => "double NOT NULL default '0'" // see doctrine/dbal#1018
174174
),
175175
'repetitions' => array
176176
(

0 commit comments

Comments
 (0)