mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-03-31 20:23:20 -04:00
Code Issues Packages Projects Releases Wiki Activity
20,717 Commits 80 Branches 104 Tags
0da5403a3cc030d531f22f6d47dcd8575ff51bcc
Commit Graph

1848 Commits

Author SHA1 Message Date
Isaac Connor
2141a5dd1c Don't include 0 width in janus video tag 2022-06-15 13:08:48 -04:00
Isaac Connor
cf88497c77 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-06-15 12:42:07 -04:00
Isaac Connor
c189250a61 Add AnalysisImage and options to MOnitor object 2022-06-15 11:27:48 -04:00
Isaac Connor
a578370970 Add filter terms for snapshots 2022-06-09 12:13:58 -04:00
Isaac Connor
866ad4f5e2 Don't turn '0' into '' 2022-06-07 09:44:37 -04:00
Ingemārs
af2f1cc6e6 Update config.php.in 2022-06-07 12:33:41 +03:00
Isaac Connor
4a6ad1f880 move dateFormatters to config. This is so that they get setup even if not using index.php. Like cakephp for example. 2022-06-02 20:13:37 -04:00
Isaac Connor
beec86fda2 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-06-02 20:09:33 -04:00
Isaac Connor
73977c518d use zm_setcookie function with will set required cookie fields so that cookie actually gets set 2022-06-02 15:11:47 -04:00
Isaac Connor
7b5a0bc775 Use dateTimeFOrmatter to format the date/time on log entries 2022-06-01 15:49:09 -04:00
Isaac Connor
eaa94ce370 update format string to date() format instead of strftime format 2022-06-01 15:48:50 -04:00
Isaac Connor
eb5c1372c7 convert from strftime() to date() when forming sql 2022-06-01 15:47:19 -04:00
Isaac Connor
907cdcd952 convert from strftime() to date() when forming the event path 2022-06-01 15:46:53 -04:00
Isaac Connor
7c0dcfcefc handle various functions no longer dealing with null 2022-06-01 13:01:40 -04:00
Isaac Connor
553c79d8f9 Put back ctype_digit and quoting of the sql to fix loading object in new 2022-06-01 12:59:09 -04:00
Isaac Connor
976de0606f Add default value for Storage Path 2022-06-01 11:20:28 -04:00
Isaac Connor
c00fd25c30 Add default value for Username 2022-06-01 11:20:16 -04:00
Isaac Connor
7ef965c100 Test for values being trueish as passing null to strcmp is deprecated 2022-06-01 10:41:07 -04:00
Isaac Connor
8f2b8bf478 Test for is_array first, get rid of ctype_digit test as passing a null to it is deprecated 2022-06-01 10:40:31 -04:00
Isaac Connor
b47d036b89 Use date() instead of strftime() for date formatting now that strftime is deprecated 2022-06-01 10:37:04 -04:00
Isaac Connor
d97ef46b57 Add defaults for RecordingSource and AnalysisSource to prevent warnings when creating new monitor 2022-05-30 14:28:38 -04:00
Isaac Connor
e11030095c Add mode=single option 2022-05-30 13:35:36 -04:00
Isaac Connor
1314295020 Don't update DiskSpace with a 0 value when listing events. This generally happens with missing events and causes too much contention on the Events and summaries tables 2022-05-30 10:26:04 -04:00
tftadmin Appleton
8254e12fa6 Fix password_type test on REQUEST['password'] instead of user['Password'] causing password migrations to not happen 2022-05-18 18:59:56 -04:00
Isaac Connor
acd63ee0d8 Don't assuming we want to communicate with zms if streaming. 2022-05-11 10:21:44 -04:00
Isaac Connor
e26aa6d0ae Set samesite for session ZMSESSID cookie for php < 7.3 2022-05-10 20:22:44 -04:00
Isaac Connor
997c1197cf Implement decoding=Keyframes + OnDemand 2022-05-10 14:25:34 -04:00
Isaac Connor
76f01647f1 define CMD_GET_IMAGE for completeness 2022-05-07 19:39:01 -04:00
Isaac Connor
2f25421cf0 Spacing 2022-05-07 19:39:01 -04:00
Isaac Connor
dff60e5a0b Need a ; before report-uri 2022-05-04 13:02:34 -04:00
Isaac Connor
e3787d05e1 Use Content-Security-Policy: for all views instead of Report-Only 2022-05-04 12:08:17 -04:00
Isaac Connor
74fd90cfdd Remove loading=lazy, it breaks ajax 2022-04-28 17:14:06 -04:00
Isaac Connor
84ae91fe24 Comment out width and height setting on the imageFrame 2022-04-28 15:45:35 -04:00
Isaac Connor
2a7217ec0d Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-27 15:55:12 -04:00
Isaac Connor
0cb15d3418 Remove extra { breaking ptz 2022-04-23 19:29:04 -04:00
Isaac Connor
07e6ae931f Add mid and zid to zone polygon so that we can use them in atached onclicks 2022-04-22 15:50:00 -04:00
Isaac Connor
91a5642edc merge 2022-04-19 17:07:20 -04:00
Isaac Connor
1eaeccc564 Handle zones not being set in options 2022-04-19 12:31:43 -04:00
Isaac Connor
7b5ee86ee8 Move svg zone display into Monitor->getStreamHTML. Remove most of it because scaling is now automatic. Move styling to css 2022-04-10 18:54:01 -04:00
Isaac Connor
e8391ad0be Move collapsed status to Monitor.php and put back setting width and height on the monitorStream container. 2022-04-10 17:28:38 -04:00
Isaac Connor
906951e450 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2022-04-06 10:37:10 -04:00
Isaac Connor
0e337cd8bf Remove support for Cambozola which no longer works or is needed. 2022-04-06 10:37:02 -04:00
Isaac Connor
4fd027fbcc Fix test for chrome version 7 by not including periods. We only care about the major and php is confused. 2022-04-04 17:03:36 -04:00
Isaac Connor
ed7c139fb3 Add backtrace to ajaxError 2022-04-04 15:00:33 -04:00
Isaac Connor
d0ee8dc6fd remove duplicated factor code, define speed so that it doesn't generate an error if not HasSpeed in Control. 2022-03-29 17:19:31 -04:00
Isaac Connor
723c10ca19 Cleanup options, add DecodingOptions 2022-03-28 17:45:01 -04:00
Isaac Connor
531793276f Fix auth'd user information being saved to session before switching session id's leaving bogus authenticated user in previous session. 2022-03-21 15:31:44 -04:00
Isaac Connor
23aa41091f Add Trigger/etc to onMotion recording option 2022-03-20 19:13:46 -04:00
Isaac Connor
f49601a173 Add filtering to Username to prevent XSS 2022-03-10 14:09:41 -05:00
Isaac Connor
0c31e35b4e Add classes to fields of monitor status so we can style them as needed 2022-03-04 12:06:49 -05:00