From 55f2e7c6a2d289ea993d3de38ba93fd6d84c91cd Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Fri, 15 Jun 2018 15:21:10 -0400 Subject: [PATCH 1/3] Fix #2124. Always allow selection of checkboxes, include canEdit(Events) in button disabling. --- web/skins/classic/js/skin.js.php | 2 ++ web/skins/classic/views/events.php | 7 +++--- web/skins/classic/views/js/events.js | 36 ++++++++++++++++++---------- 3 files changed, 29 insertions(+), 16 deletions(-) diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php index f726f06a5..f072a911e 100644 --- a/web/skins/classic/js/skin.js.php +++ b/web/skins/classic/js/skin.js.php @@ -34,6 +34,8 @@ var skinPath = ""; var canEditSystem = ; var canViewSystem = ; +var canEditEvents = ; +var canViewEvents = ; var canEditGroups = ; diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php index 3b62541ce..eb5ccb14d 100644 --- a/web/skins/classic/views/events.php +++ b/web/skins/classic/views/events.php @@ -142,7 +142,6 @@ if ( $pages > 1 ) { $count = 0; $disk_space_total = 0; -Logger::Debug("EventSql: $eventsSql"); $results = dbQuery($eventsSql); while ( $event_row = dbFetchNext($results) ) { $event = new Event($event_row); @@ -173,7 +172,7 @@ while ( $event_row = dbFetchNext($results) ) { } if ( ZM_WEB_EVENT_DISK_SPACE ) { ?> - + - disabled="disabled"/> + '; } // end if ZM_WEB_LIST_THUMBS ?> - disabled="disabled"/> + Date: Fri, 15 Jun 2018 14:44:00 -0500 Subject: [PATCH 2/3] Create stale.yml --- .github/stale.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/stale.yml diff --git a/.github/stale.yml b/.github/stale.yml new file mode 100644 index 000000000..971d85ea5 --- /dev/null +++ b/.github/stale.yml @@ -0,0 +1,26 @@ +# Configuration for probot-stale - https://github.com/probot/stale + +# Number of days of inactivity before an issue becomes stale +daysUntilStale: 60 + +# Number of days of inactivity before a stale issue is closed +daysUntilClose: 7 + +# Issues with these labels will never be considered stale +exemptLabels: + - "Under Review" + +# Set to true to ignore issues in a milestone (defaults to false) +exemptMilestones: true + +# Label to use when marking an issue as stale +staleLabel: stale + +# Comment to post when marking an issue as stale. Set to `false` to disable +markComment: > + This issue has been automatically marked as stale because it has not had + recent activity. It will be closed if no further activity occurs. Thank you + for your contributions. + +# Comment to post when closing a stale issue. Set to `false` to disable +closeComment: false From 09aa3afaac6fb2092fd0b09af03c6054222aa290 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sat, 16 Jun 2018 16:47:09 -0400 Subject: [PATCH 3/3] Fix capitalisation of Ffmpeg --- web/skins/classic/views/monitor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php index f6bf1d183..2e1d467f6 100644 --- a/web/skins/classic/views/monitor.php +++ b/web/skins/classic/views/monitor.php @@ -923,7 +923,7 @@ if ( $monitor->Type() == 'Local' ) { 0 => 'Disabled', 1 => 'X264 Encode', ); - if ($monitor->Type() == 'FFMpeg' ) + if ($monitor->Type() == 'Ffmpeg' ) $videowriteropts[2]='H264 Camera Passthrough'; echo htmlselect( 'newMonitor[VideoWriter]', $videowriteropts, $monitor->VideoWriter() ); ?>