Isaac Connor
|
3e55795cad
|
Handle different command line syntax for zmcontrol.pl
|
2020-03-26 13:57:43 -04:00 |
|
Isaac Connor
|
b354641df3
|
fix syntax errors in triggers in monitor view
|
2020-03-26 13:57:19 -04:00 |
|
Isaac Connor
|
af36cc3e52
|
Fix starting and stopping zmcontrol processes across servers.
|
2020-03-26 13:57:00 -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
|
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 |
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
|
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
|
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
|
bab0b2e830
|
handle a scale value of auto
|
2020-02-27 11:35:40 -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
|
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
|
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
|
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 |
|
Isaac Connor
|
d7f8f201be
|
Fix zoneminder.com url getting undefined being added to it
|
2020-02-22 10:51:26 -05:00 |
|
Isaac Connor
|
1a87eb40bd
|
Fixes #2841 and maintains login through password change
|
2020-02-19 16:55:38 -05:00 |
|
Isaac Connor
|
789db4e5a6
|
Fix filter new rows missing their onchange event on attribute dropdown. Fixes #2817
|
2020-02-18 13:29:06 -05:00 |
zlodag
|
a8615c1c85
|
fixed bug in control functions where left arrow panStep was inverted
|
2020-02-16 11:41:14 +13:00 |
|
Isaac Connor
|
289bde869d
|
use a better language for unset value
|
2020-02-11 14:31:48 -05:00 |
|
Isaac Connor
|
9f9a97f596
|
fix dropdown with unset option
|
2020-02-11 14:29:21 -05:00 |
|
Isaac Connor
|
844ff529e1
|
add an unset value to ZM_TIMEZONE in Options->System
|
2020-02-11 13:24:26 -05:00 |
|
Isaac Connor
|
600dbba8c5
|
We don't need to set date_default_timezone_get
|
2020-02-11 13:23:53 -05:00 |
|
Isaac Connor
|
821355c117
|
Only set date.timezone if we have a configured value in the Config
|
2020-02-11 13:21:28 -05:00 |
|
Isaac Connor
|
137bdb1f24
|
Make shm have error or warning class if full
|
2020-02-10 14:20:46 -05:00 |
|
Isaac Connor
|
389a6b3ec8
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-02-06 13:22:30 -05:00 |
|
Isaac Connor
|
c465fa55d8
|
Use ZM_PATH_FFMPEG instead of ffmpeg
|
2020-02-06 13:22:22 -05:00 |
|
Isaac Connor
|
1cbc75813c
|
improve the output of the ajaxError to say what the action was and who the user was
|
2020-02-06 13:21:57 -05:00 |
|
Isaac Connor
|
dd0ce50c17
|
quotes and improve the output of the ajaxError to say what the action was and who the user was
|
2020-02-06 13:21:30 -05:00 |
|
Isaac Connor
|
e8a0ed9208
|
quotes and improve the output of the ajaxError to say what the action was and who the user was
|
2020-02-06 13:20:35 -05:00 |
|
Isaac Connor
|
1c2f2657d2
|
We don't do automatic login when recaptcha is enabled, so add the login calls on successful recaptcha
|
2020-02-04 16:41:19 -05:00 |
|
Isaac Connor
|
42b3bb6a53
|
increase width of google sitekey and secret key inputs to 100%
|
2020-02-04 16:40:52 -05:00 |
|
Isaac Connor
|
6345ecc479
|
remove debug
|
2020-01-23 17:04:33 -05:00 |
|
Isaac Connor
|
dbdb13efd7
|
Instead of passing query string in form post variables, store it in session so that it survives redirects. Fixes #2811
|
2020-01-20 11:02:43 -05:00 |
Garrett Scott
|
ead52f30b1
|
Bug fix: Allows for inital/base install without the option MultiPort config value assigned
|
2020-01-20 00:44:20 -08:00 |
|
Isaac Connor
|
75fa1d693d
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-01-18 16:09:44 -05:00 |
|
Isaac Connor
|
a3754709e4
|
allow filters to not have terms specified. We can't pass an empty array in a url, so we will just have to handle it.
|
2020-01-18 16:09:33 -05:00 |
|
Isaac Connor
|
6c7f003198
|
revert bogus change not including skin.js
|
2020-01-18 16:08:55 -05:00 |
Andrew Bauer
|
de5bf21d8a
|
fix eslint
|
2020-01-17 15:06:46 -06:00 |
|
Isaac Connor
|
5b8e5eb349
|
don't output duplicated js when css=base
|
2020-01-17 14:51:02 -05:00 |
|
Isaac Connor
|
86a2523498
|
break up a long line, add some parenthesis to clarify logic
|
2020-01-17 12:30:26 -05:00 |
|
Isaac Connor
|
a398f33e68
|
fix delTerm button not being enabled because it is a button now, not an input
|
2020-01-17 09:17:29 -05:00 |
|
Isaac Connor
|
4f2df830a8
|
fix inline js
|
2020-01-17 09:17:05 -05:00 |
|
Isaac Connor
|
74b3ad6dd9
|
add options help for HWACCEL options
|
2020-01-16 14:33:37 -05:00 |
|
Isaac Connor
|
6a43c2deb5
|
fix zoom_range to zoomout_range
|
2020-01-16 14:17:40 -05:00 |
|
Isaac Connor
|
028e7e8dde
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-01-15 19:03:11 -05:00 |
|
Isaac Connor
|
09f2298838
|
return empty array instead of nothing in probeNetwork
|
2020-01-15 19:02:40 -05:00 |
Javier Gonzalez
|
8b375de455
|
Avoid duplicate Monitors in API
|
2020-01-15 20:31:05 +01:00 |
|
Isaac Connor
|
02e9096d2b
|
When saving an existing Filter and we are unchecking Background, need to stop the filter before saving. Remove dead code
|
2020-01-13 17:32:57 -05:00 |
|
Isaac Connor
|
e4ba1fd432
|
fix restarting zmcontrol on remote servers by passing object=filter as well
|
2020-01-13 17:16:15 -05:00 |
|
Isaac Connor
|
d7dc7cdc47
|
Add ServerId to database log entries in php
|
2020-01-13 16:18:01 -05:00 |
|
Isaac Connor
|
9036b6db77
|
fix typo
|
2020-01-13 16:17:39 -05:00 |
|
Isaac Connor
|
f3a9e608db
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-01-13 16:11:19 -05:00 |
|
Isaac Connor
|
91acb775eb
|
Fix Eventount to EventCount
|
2020-01-13 13:43:14 -05:00 |
|
Isaac Connor
|
b11815cfa9
|
Introduce Storage->EventCount to get the # of events per storage without actually loading all events.
|
2020-01-13 12:53:50 -05:00 |
|
Isaac Connor
|
6cd76ee2ff
|
Clear cache after loading Events so as to free ram.
|
2020-01-13 12:53:05 -05:00 |
|
Isaac Connor
|
f7e2359818
|
Implement a clear_cache function so that we can free up cached objects
|
2020-01-13 10:57:56 -05:00 |
|
Isaac Connor
|
398688550b
|
fixtypo
|
2020-01-10 20:15:52 -05:00 |
|
Isaac Connor
|
fabb7180d6
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-01-10 20:13:28 -05:00 |
|
Isaac Connor
|
0c478c7962
|
fix Monitor->Server
|
2020-01-10 20:13:09 -05:00 |
PrplHaz4
|
6a4b66a792
|
add 3840x2160 4k UHD to monitor dropdown
I think this is fairly common in consumer IP cams now...
|
2020-01-10 19:44:06 -05:00 |
|
Isaac Connor
|
2f5caf2bb5
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-01-10 17:21:10 -05:00 |
|
Isaac Connor
|
5ee0158735
|
Set defaults for vars == ''
|
2020-01-10 16:42:41 -05:00 |
|
Isaac Connor
|
f61f6eaf7d
|
remove line cutnpasted erroneously
|
2020-01-10 12:45:47 -05:00 |
|
Isaac Connor
|
d433590f74
|
use find_one in stead of new to use Cached Server
|
2020-01-10 12:45:30 -05:00 |
|
Isaac Connor
|
ef4ecd40fb
|
Set defaults before saving Objects
|
2020-01-10 12:44:59 -05:00 |
Alex Porosanu
|
28a4bef6ba
|
fix tar invocation for *BSD platforms
"--xform" switch is not supported by tar on BSD platforms i.e. *BSD,
MacOS, etc. As such, use "-s" switch on these platforms, with a
similar regexp.
|
2020-01-09 22:03:02 +02:00 |
|
Andrew Bauer
|
f13a7199e1
|
fix eslint
|
2020-01-07 21:53:55 -06:00 |
|
Isaac Connor
|
c64de372a7
|
when auth_hash changes, update various CmdParms
|
2020-01-07 17:08:57 -05:00 |
|
Isaac Connor
|
0571909d05
|
add remote_IP to log entries on php side
|
2020-01-07 17:08:29 -05:00 |
|
Isaac Connor
|
1865df3fe0
|
remove some debug, add some parenthesis to ensure logic works as intended
|
2020-01-07 17:08:07 -05:00 |
|
Isaac Connor
|
61bc0ddd0a
|
add missing t and merge some lines
|
2020-01-07 11:01:53 -05:00 |
|
Isaac Connor
|
2f1b725ee4
|
quote SQL for mysql8
|
2020-01-07 11:01:02 -05:00 |
|
Isaac Connor
|
7535769e4b
|
controlcap needs to be larger
|
2020-01-05 17:34:40 -05:00 |
|
Isaac Connor
|
71581831b5
|
fix problem with the clone button material icon. Apparently file_copy doesn't work, so use content_copy instead despite it not being listed in the material icons
|
2020-01-05 17:34:27 -05:00 |
|
Isaac Connor
|
6ac26ec1aa
|
quotes
|
2020-01-05 17:33:53 -05:00 |
|
Isaac Connor
|
c3641df531
|
spaces
|
2020-01-05 17:30:06 -05:00 |
|
Isaac Connor
|
00f8a450de
|
spaces and quotes
|
2020-01-05 14:59:25 -05:00 |
|
Isaac Connor
|
7fdf6165d5
|
Fix case in var name
|
2020-01-03 17:08:11 -05:00 |
|
Isaac Connor
|
c8e39e2418
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2020-01-03 16:35:15 -05:00 |
|
Isaac Connor
|
e951b0af1c
|
add code to set default value for checkboxes
|
2020-01-03 16:35:04 -05:00 |
|
Isaac Connor
|
0a495395b0
|
Restore Gain tab
|
2020-01-03 16:34:46 -05:00 |
|
Isaac Connor
|
f572c4092a
|
add checks for Zoom, Focus, White, Iris movement types
|
2020-01-03 15:58:57 -05:00 |
|
Isaac Connor
|
158e26bb25
|
split long lines
|
2020-01-03 15:58:02 -05:00 |
|
Isaac Connor
|
c4aaa33bea
|
add widths for number inputs on controlcap view
|
2020-01-03 15:57:51 -05:00 |
|
Isaac Connor
|
0b3776dbf0
|
change text inputs to number inputs, cleanups
|
2020-01-03 15:57:29 -05:00 |
|
Isaac Connor
|
89844f72f4
|
Merge pull request #2790 from pliablepixels/jwt-token-duration
fix JWT access token always being 1 hr
|
2020-01-02 17:22:37 -05:00 |
|
Isaac Connor
|
d42e9beddc
|
Add warnings when the type of movement is not selected
|
2020-01-02 17:03:52 -05:00 |
|
Isaac Connor
|
e9815bf9c7
|
add ZM Namespace to Error calls
|
2020-01-02 16:54:50 -05:00 |