Isaac Connor
49e3f0a68e
eslint fixes
2019-03-28 09:43:31 -04:00
Isaac Connor
052a2ef1fd
fix eventserver => eventnotification
2019-03-25 12:20:21 -04:00
Isaac Connor
7565e171b4
spacing
2019-03-25 12:18:15 -04:00
Isaac Connor
4eafc52955
spacing
2019-03-25 12:18:01 -04:00
Isaac Connor
7e62ccca3c
Handle div by zero when TotalMem is not known for Server
2019-03-25 12:08:56 -04:00
Isaac Connor
8d07a4a08f
Log useful error messages when can't mkdir the monitor events dir or the symlink to it. symlink is a warning because the symlink is just a user aid
2019-03-25 11:58:04 -04:00
Isaac Connor
677b9cfbed
Make controlcap popup wider
2019-03-24 09:59:04 -04:00
Isaac Connor
bd5c9b5b20
add Control to ZM namespace
2019-03-24 09:58:50 -04:00
Isaac Connor
f311fcc9e0
change to a button
2019-03-22 17:28:23 -04:00
Isaac Connor
8f28ba0be3
beter debug and less often when no terms in parseFilter
2019-03-22 17:28:12 -04:00
Isaac Connor
6d4d353209
fix namespace on MontageLayout
2019-03-22 17:27:58 -04:00
Isaac Connor
16467595d4
Fix clicking in montage
2019-03-21 17:00:51 -04:00
Isaac Connor
65fab1b032
add px to width and height of event img
2019-03-21 14:14:45 -04:00
Isaac Connor
7f7acc18ee
spacing and code doc
2019-03-21 14:14:30 -04:00
Isaac Connor
f434042c52
fix spacing
2019-03-21 14:14:15 -04:00
Isaac Connor
f5dfa0d740
Spacing and fix clone monitor by setting the Id to 0 instead of nextId, so that when we go to save it, we use an insert instead of an update
2019-03-20 15:03:20 -04:00
Isaac Connor
10a972f2a0
fixes to download video
2019-03-20 14:51:59 -04:00
Isaac Connor
d4353af8af
Fix eslint errors
2019-03-20 14:51:39 -04:00
Isaac Connor
a5366d522d
Fixup exporting
2019-03-20 14:29:05 -04:00
Isaac Connor
ae7391689b
Add some code doc
2019-03-20 14:28:19 -04:00
Isaac Connor
ad059f985e
spacing
2019-03-20 14:27:23 -04:00
Isaac Connor
09b42f8b55
remove nonce from js because it is the exported html not part of the zm web ui
2019-03-20 14:27:10 -04:00
Isaac Connor
6efeab5f8d
improve readability of parseFilter
2019-03-20 14:26:48 -04:00
Isaac Connor
b988ce0573
more parentheses to make logic more clear
2019-03-20 14:26:35 -04:00
Isaac Connor
c3324ada18
Put back mkdir ZM_PATH_SOCKS
2019-03-20 14:26:03 -04:00
Isaac Connor
84a200395e
spacing and turn off errors because ajax should only return json
2019-03-20 14:25:34 -04:00
Isaac Connor
52e66adc99
Fix namespace
2019-03-20 14:25:12 -04:00
Isaac Connor
a634d8b774
use id instead of this->data when loading Event to delete in API
2019-03-19 17:26:20 -04:00
Isaac Connor
0623afb0ae
add language entry for Monitor DefaultCodec
2019-03-19 12:19:58 -04:00
Isaac Connor
71cd024fda
spacing updates. Use MP4 instead of H264/H265 in viewing codec dropdown
2019-03-19 12:16:31 -04:00
Isaac Connor
6b6e787e4e
fix ajax stream code
2019-03-19 12:05:45 -04:00
Isaac Connor
418276ff1c
cleanup/debug
2019-03-19 12:02:42 -04:00
Isaac Connor
3f9564c10a
Merge branch 'master' into storageareas
2019-03-19 10:37:35 -04:00
Isaac Connor
428f7e8e8f
create setup_onclick and disable_onclick in the monitor object. Use it to setup and disable the click event when editing/cancelling layout editing
2019-03-19 10:24:30 -04:00
Isaac Connor
72b87a7c00
Add code to be a bit more careful about not deleting all events when an incomplete event object is used.
2019-03-19 09:36:58 -04:00
Isaac Connor
2c1c9fe6cd
fix missing ZM namespaces
2019-03-19 09:23:35 -04:00
Isaac Connor
1d3af44d02
Fix namespace Warning
2019-03-19 09:13:56 -04:00
Chris
ad5f6a8729
Camera reboot function ( #2554 )
...
* Adding a button for camera reboot function
This series of commits will add a camera reboot function to the
control interface if supported by the camera configuration.
* Adding reboot function option to contorl configuration
This patch adds a reboot option to the camera control configuration
view.
* Adding Reboot field to Controls table
This patch adds a Reboot field to the Controls table to support
a camera reboot control option.
* Correcting button value to match reset
* Updating language files
I'm not sure of the proper procedure to trigger updating of
non-english language files so I'm updating them all with English
hoping that that will draw attention to the changes and others
will translate accordingly.
* Add missing forward slash
2019-03-18 14:49:05 -04:00
Isaac Connor
520c41da23
Merge ../ZoneMinder.connortechnology.bad into storageareas
2019-03-18 14:40:03 -04:00
Isaac Connor
06eb38f802
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-03-18 11:24:33 -04:00
Isaac Connor
9482207f5c
revert namespace stuff in index.php
2019-03-18 11:24:28 -04:00
Matthew Noorenberghe
3c31dd63ce
Use zm_session_start() for API auth. Fixes #2547
2019-03-11 00:27:46 -07:00
Matthew Noorenberghe
abb6ef1688
API: Escape 'named' params for SQLi in two more Event endpoints.
...
Fixes #2099
2019-03-11 00:21:51 -07:00
Matthew Noorenberghe
056b96f7fc
API: Monitor and Event 'index' SQLi. Fixes #2099
2019-03-11 00:21:51 -07:00
Matthew Noorenberghe
ac547e0d5d
Don't scroll to the top of the page when force/cancel alarm is clicked
2019-03-10 20:58:24 -07:00
Matthew Noorenberghe
e6220e9d07
Fix eslint issues in cycle.js
2019-03-10 20:56:08 -07:00
Isaac Connor
6c8eac1ac8
Merge branch 'storageareas' into h265
2019-03-06 11:10:01 -05:00
Isaac Connor
24665264a2
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-03-05 20:16:05 -05:00
Isaac Connor
e59eb510e3
update and fix the donate popup
2019-03-05 13:10:04 -05:00
Isaac Connor
73ae3f49ed
Merge branch 'master' into storageareas
2019-03-05 11:35:55 -05:00