Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas

pull/2077/head
Isaac Connor 2017-10-05 09:35:32 -04:00
commit de03726675
4 changed files with 10 additions and 2 deletions

View File

@ -265,7 +265,7 @@ CREATE TABLE `Groups` (
`Id` int(10) unsigned NOT NULL auto_increment,
`Name` varchar(64) NOT NULL default '',
`ParentId` int(10) unsigned,
`MonitorIds` tinytext NOT NULL,
`MonitorIds` text NOT NULL,
PRIMARY KEY (`Id`)
) ENGINE=@ZM_MYSQL_ENGINE@;

1
db/zm_update-1.31.7.sql Normal file
View File

@ -0,0 +1 @@
ALTER TABLE Groups MODIFY `MonitorIds` text NOT NULL;

View File

@ -1 +1 @@
1.31.6
1.31.7

View File

@ -154,6 +154,7 @@ if ( file_exists( "skins/$skin/css/$css/graphics/favicon.ico" ) ) {
} // end function xhtmlHeaders( $file, $title )
function getNavBarHTML() {
$versionClass = (ZM_DYN_DB_VERSION&&(ZM_DYN_DB_VERSION!=ZM_VERSION))?'errorText':'';
@ -166,6 +167,12 @@ function getNavBarHTML() {
global $bwArray;
global $view;
?>
<noscript>
<div style="background-color:red;color:white;font-size:x-large;">
ZoneMinder requires Javascript. Please enable Javascript in your browser for this site.
</div>
</noscript>
<div class="navbar navbar-inverse navbar-static-top">
<div class="container-fluid">
<div class="navbar-header">