Commit Graph

16313 Commits

Author SHA1 Message Date
Andrew Bauer 8cc716c441
Attempt to resolve f33 build failaire
Apparently we are dealing with either a kernel bug or a bug in coreutils package.
For details, see: https://bugzilla.redhat.com/show_bug.cgi?id=1760300#c31
2020-09-16 12:49:54 -05:00
Isaac Connor 147238027c Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-09-16 09:59:28 -04:00
Isaac Connor bea23e2241 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-16 09:58:49 -04:00
Isaac Connor c1f872c9aa Reinit chosen on log filters after updating them 2020-09-16 09:58:15 -04:00
Andrew Bauer e5cf74c3d8 remove unused and potentially conflicting id's 2020-09-16 08:54:13 -05:00
Andrew Bauer afdd4702a2 add server modal 2020-09-16 08:30:45 -05:00
Isaac Connor 4fa9237048 Fix eslint 2020-09-16 08:57:44 -04:00
Isaac Connor a430fe1f7a correct EndTime to End Date/Time. EndTime and EndDate terms are also effective 2020-09-15 21:19:10 -04:00
Isaac Connor 32f60631b3 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-15 18:53:42 -04:00
Isaac Connor 81306928b8 Fix scale width and height dropdown actions on cycle 2020-09-15 18:53:39 -04:00
Andrew Bauer 21d4773da9 fix badly formatted line 2020-09-15 13:08:44 -05:00
Andrew Bauer da73ecee08 delete commented line 2020-09-15 13:05:05 -05:00
Andrew Bauer 5f361094bb unpopup frames and alarmframes in export view 2020-09-15 13:01:35 -05:00
Andrew Bauer 40eb60f644 unpopup monitor config from export view 2020-09-15 12:52:13 -05:00
Andrew Bauer fd7d5317af create getCSRFinputHTML function 2020-09-15 11:06:16 -05:00
Andrew Bauer 798557604f
remove old pagination var from events.php 2020-09-15 10:58:42 -05:00
Andrew Bauer 845815b566 unpopup call to image view 2020-09-15 10:51:45 -05:00
Andrew Bauer be150479a1 unpopup Max Score link in events view 2020-09-15 10:37:05 -05:00
Andrew Bauer df443326ea unpopup monitor link in events view 2020-09-15 10:31:14 -05:00
Isaac Connor e61d8c37b3 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-09-15 11:12:27 -04:00
Isaac Connor df18359f61 query_string to querystring 2020-09-15 11:12:20 -04:00
Andrew Bauer b9d95f0833 fix typo 2020-09-15 09:50:53 -05:00
Andrew Bauer 33ef700dda Cause links in events use eventdetail modal 2020-09-15 09:49:03 -05:00
Isaac Connor d39beb5714 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-15 10:22:36 -04:00
Andrew Bauer accfd1191f update eventdetail modal 2020-09-15 09:20:38 -05:00
Isaac Connor fa1ade6b7b Fix obr getting cbr value 2020-09-15 10:11:07 -04:00
Isaac Connor 9e12090348 Merge branch 'master' of github.com:zoneminder/ZoneMinder 2020-09-15 10:00:24 -04:00
Andrew Bauer 121671327c call eventdetail modal rather than popup 2020-09-15 08:55:32 -05:00
Andrew Bauer 1d3ce1c916
must define sortQuery as a global in export view 2020-09-15 08:27:44 -05:00
Andrew Bauer 197dfd4b39
Add fedora 33 support to build system 2020-09-14 17:49:36 -05:00
Isaac Connor ad0f8d674d sort_asc is a boolean. ZM_WEB_EVENT_SORT_ORDER is asc|desc 2020-09-14 15:13:41 -04:00
Isaac Connor 5b2f397a54 Update EVENT_SORT_ORDER options 2020-09-14 15:13:04 -04:00
Andrew Bauer ba900dd9dc change table type to increase row padding 2020-09-14 14:07:49 -05:00
Andrew Bauer 508967ffe9 fix typo on modal.php 2020-09-14 13:51:24 -05:00
Andrew Bauer fb85d6f79c rough in eventdetail modal 2020-09-14 13:47:09 -05:00
Isaac Connor 691be74304 fix th text-align on tables in options 2020-09-14 14:09:41 -04:00
Isaac Connor ab8e2d2e6c Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-09-14 14:05:02 -04:00
Isaac Connor 77fb533e48 Fix default value for AutoExecuteCmd 2020-09-14 14:04:36 -04:00
Isaac Connor e5776b79fa Introduce %EVF% Event video filename subst 2020-09-14 14:04:18 -04:00
Isaac Connor d02a61e715 change will to might 2020-09-14 14:03:55 -04:00
Isaac Connor d93e9e351b Introducing a simple script that we can use in a filter to change the fps of a recording 2020-09-14 13:47:46 -04:00
Andrew Bauer cc7b65e8aa eslint 2020-09-14 10:31:44 -05:00
Andrew Bauer d2bc39f65f replace storage popup with modal 2020-09-14 09:50:04 -05:00
Pliable Pixels 8ad62b8905 another try at fixing Eventcontroller 2020-09-13 16:43:49 -04:00
Andrew Bauer 0a0b555c4c refresh table after archive or unarchive 2020-09-13 11:32:28 -05:00
Andrew Bauer 29710f67ac fix table refresh after delete 2020-09-13 11:25:31 -05:00
Andrew Bauer c4c4551436 replace no permission alerts with enoperm() 2020-09-13 11:09:15 -05:00
Andrew Bauer 54e8d1352a add enoperm js function 2020-09-13 11:04:04 -05:00
Andrew Bauer 096f4a446f Use Ajax to load delete confirm modal 2020-09-13 10:39:51 -05:00
Andrew Bauer 7e55dd14a2 eslint 2020-09-13 08:52:52 -05:00