ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,790 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

14790 Commits

Author SHA1 Message Date
Pliable Pixels cf6b24b432 add ES status to telemetry and --show option to display what is being sent to ZM 2020-03-26 12:11:00 -04:00
hax0kartik eed45ae66c Fix 2892 2020-03-26 12:08:44 -04:00
Isaac Connor ea7bea4c6e fix warnings because length() returns long unsigned int, but gnutls_datum_t size is unsigned int. 2020-03-26 12:08:21 -04:00
Isaac Connor a5ec89ab1b use bool instead of my_bool to fix #2886 2020-03-26 12:07:58 -04:00
Isaac Connor 188b8a7f2d Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-03-24 14:57:00 -04:00
Isaac Connor 0b5ebbbe59 add focal to ubuntu builds 2020-03-24 14:56:25 -04:00
Isaac Connor d3df0defc9 Support missing openssl_random_pseudo_bytes by using alternate functions 2020-03-21 15:28:18 -04:00
Isaac Connor ecaaae90f3 fix streamImg loading when using applet. Also don't alter actParms as it is not a global. 2020-03-20 11:06:01 -04:00
Isaac Connor 59bd658a96 replace vjsPause with pauseCLicked. Fix behaviour with rate dropdown and reverse/pause etc. 2020-03-10 18:46:20 -04:00
Isaac Connor 84d719f2dd Merge branch 'release-1.34' into rate_dropdown 2020-03-10 16:06:11 -04:00
Isaac Connor 5fe1452a1a
Merge pull request #2879 from pliablepixels/1.34-dev 
return frame IDs of snapshot and alarm frames for a specific e…
 2020-03-09 14:44:41 -04:00
Isaac Connor e8553babfa remove extra spaces, fix eslint 2020-03-09 14:43:54 -04:00
Isaac Connor ffed88454f Provide a more useful error message when the monitor's function is set to NONE. Fixes #2877 2020-03-09 13:14:09 -04:00
Pliable Pixels a261efe0a7 return relative frameId, also sort score frame by lowest frame to avoid bulk frames incase score is 0 2020-03-09 12:04:40 -04:00
Pliable Pixels 3611d147e6 fix score frameID to return ID not Score 2020-03-09 11:25:07 -04:00
Pliable Pixels c5e838fa33 return global frame IDs of snapshot and alarm frames for a specific event 2020-03-09 11:09:20 -04:00
Isaac Connor e56976c800 Triggers cannot be null, it is '' instead 2020-03-08 17:23:48 -04:00
Isaac Connor bb72e3000c Merge pull request #2867 from veprbl/pr/cmake_install_full 
cmake: use CMAKE_INSTALL_FULL_
 2020-03-06 15:05:50 -05:00
Isaac Connor 6d787fd77e Bump version for 1.34.6 2020-03-06 14:52:38 -05:00
Isaac Connor 3a129a8818 Merge pull request #2874 from hax0kartik/2810-libjwt 
Add libjwt and remove gnutls-openssl wrapper
 2020-03-06 14:48:45 -05:00
Isaac Connor af2b6c435e Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-03-04 14:18:59 -05:00
Isaac Connor 424677165f Use ppa:iconnor/zoneminder-master instead of ppa:iconnor/zoneminder 2020-03-04 14:18:50 -05:00
Isaac Connor 24f04b8551
Merge pull request #2871 from pliablepixels/1.34-dev 
move the recommended install method before what is discouraged
 2020-03-04 11:59:02 -05:00
Pliable Pixels 4f8745809a move the recommended install method before what is discouraged 2020-03-04 11:42:55 -05:00
Isaac Connor 53f262a4cb Merge pull request #2870 from pliablepixels/dev 
#2866 - fixes incorrect token type comparison
 2020-03-04 11:31:16 -05:00
Isaac Connor bd59ae8856 Move the Basic Auth login code from skin.php to includes/auth.php 2020-03-02 15:00:31 -05:00
Isaac Connor e3e9fd2bc1 Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-03-02 12:08:32 -05:00
Isaac Connor 7c21f065bd Checking AuthHashGeneratedAt is no good because it gets updated before we check it. Instead check the auth hash in session against the one in and sensd the update if they are different 2020-03-02 12:07:11 -05:00
Isaac Connor 76131d1887 Fix timeline. Update parseFilterToTree to add missing operators. Fix logging calls to include ZM namespace. Update code style. 2020-03-01 11:07:31 -05:00
Isaac Connor 04b78ac7e6 typo and punctuation fixes. 2020-02-27 17:56:56 -05:00
Isaac Connor bab0b2e830 handle a scale value of auto 2020-02-27 11:35:40 -05:00
Isaac Connor 52cb2441f0 Bump version to 1.34.5 for release 2020-02-25 20:46:59 -05:00
Isaac Connor 1b70ed2076 Merge branch 'fix_generate_video_page' into release-1.34 2020-02-25 18:22:24 -05:00
Isaac Connor 0c70c5c2a4 Save value of V4LMultiBuffer and fix it not being checked for the Use Config Value 2020-02-25 18:14:27 -05:00
Isaac Connor a34af39ca7 Fix logging line in generate video function 2020-02-25 18:14:14 -05:00
Isaac Connor c08ec996f7 Fix various aspects of the video generating page. Clean up and update code. Remove inline javascript. Fixes #2843 2020-02-25 18:12:25 -05:00
Isaac Connor 8fcd5b37ed API on remote server requires RELAY not be none. Log an error. Fix url being ruined by auth credentials 2020-02-25 17:15:59 -05:00
Isaac Connor 7787ba1040 Fix adding auth string screwing up url to remote api in zmaControl and zmcControl 2020-02-25 17:15:45 -05:00
Isaac Connor 9febf60228
Merge pull request #2858 from connortechnology/fix_zmu_using_token_auth 
Fix zmu not respecting jwt token auth when AUTH_RELAY set to none
 2020-02-25 16:54:35 -05:00
Isaac Connor f05dbd3b89 Fix zmu not respecting jwt token auth when AUTH_RELAY set to none 2020-02-25 14:40:47 -05:00
Isaac Connor 14434e1e10
Merge pull request #2857 from connortechnology/fix_montage_review_calendar_not_updating 
Fix montagereview end calendar
 2020-02-25 13:44:07 -05:00
Isaac Connor 4c2fb6bf08 populate a js var minTime and maxTime and use it when setting up the calendar widget to set minTime for end calendar. 2020-02-25 13:40:44 -05:00
Isaac Connor e630550d0f bump version for release 1.34.4 2020-02-24 14:44:19 -05:00
Isaac Connor 173d58d8b3
Merge pull request #2852 from connortechnology/Event_list_is_not_filtered_when_Group_is_selected_on_Console 
Event list is not filtered when group is selected on console
 2020-02-24 14:37:42 -05:00
Isaac Connor 55c99c5ff3 Include filtered monitors for filter query on totals line of event counts. Fixes #2846 2020-02-24 14:34:21 -05:00
Isaac Connor f4521d20e0 Fix applying rotation to x264encoded video which has already been rotated. 2020-02-24 14:12:10 -05:00
Isaac Connor 2d3f72188d
Merge pull request #2851 from connortechnology/fix_class_PTZ_presets_almost_invisible 
fix_class_PTZ_presets_almost_invisible
 2020-02-24 13:16:19 -05:00
Isaac Connor d0a8d241d2 Don't include controls.css twice if css is base. Don't use special styles for ptz buttons, so that they look like all the other buttons. Fixes #2849 2020-02-24 13:13:54 -05:00
Pliable Pixels 7109bff6a7 mention other values for GPU 2020-02-24 12:44:36 -05:00
Isaac Connor d7f8f201be Fix zoneminder.com url getting undefined being added to it 2020-02-22 10:51:26 -05:00