Isaac Connor
|
beec86fda2
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-06-02 20:09:33 -04:00 |
|
Isaac Connor
|
a480366232
|
Don't trim select values. In monitor selects are all well defined. Fixes not being able to multi-select groups or linked monitors
|
2022-06-02 16:33:32 -04:00 |
|
Isaac Connor
|
cce403419b
|
use a global mode variable to determine if we are editing and disable clicking on image. disabling the onclick doesn't seem to be working. When activating edit mode and saving positions use #monitor instead of #monitorFrame which went away.
|
2022-06-02 15:12:09 -04:00 |
|
Isaac Connor
|
2883a78e5c
|
Fix eslint
|
2022-06-02 09:22:02 -04:00 |
|
Isaac Connor
|
b9e16f4885
|
Handle ctrl-click for opening in a new window
|
2022-06-01 16:31:11 -04:00 |
|
Isaac Connor
|
52f6be7319
|
get rid of warning when not Connected. zms can provide that message now.
|
2022-06-01 16:31:11 -04:00 |
|
Isaac Connor
|
9582ea92dd
|
Remove debug
|
2022-06-01 16:31:11 -04:00 |
Isaac Connor
|
cde59e9f79
|
convert from strftime to date
|
2022-06-01 16:18:04 -04:00 |
|
Isaac Connor
|
038e38eb13
|
convert from strftime to date
|
2022-06-01 16:17:57 -04:00 |
|
Isaac Connor
|
49a744da17
|
replace strftime, but also fix the fact that we weren't passing a format string
|
2022-06-01 16:17:40 -04:00 |
|
Isaac Connor
|
c0435c9053
|
Use global dateTimeFormatter to replace strftime
|
2022-06-01 16:17:14 -04:00 |
|
Isaac Connor
|
bd22cd7fdd
|
Use global dateTimeFormatter to replace strftime
|
2022-06-01 16:17:00 -04:00 |
|
Isaac Connor
|
804fb71c6a
|
convert from strftime() to date()
|
2022-06-01 15:59:09 -04:00 |
|
Isaac Connor
|
8a50ca9161
|
Populate the hints on ZM_LOCALE_DEFAULT
|
2022-06-01 15:52:10 -04:00 |
|
Isaac Connor
|
e8a68e4a80
|
Use dateTimeFOrmatter to format the date/time on events. Also turned off error display screwing up the js.
|
2022-06-01 15:51:45 -04:00 |
|
Isaac Connor
|
3cfb21b0f2
|
Due to bulk frames, next prev and last can't be so simply calculated. Load them from the db instead
|
2022-06-01 15:50:56 -04:00 |
|
Isaac Connor
|
fd19beb271
|
convert from strftime() to date() when filling in the weekdays array
|
2022-06-01 15:50:19 -04:00 |
|
Isaac Connor
|
133b2cad30
|
Test for isset(REQUEST['uid']
|
2022-06-01 13:34:17 -04:00 |
|
Isaac Connor
|
9f51400b4e
|
Use a date object to format Length to Duration
|
2022-06-01 13:33:58 -04:00 |
|
Isaac Connor
|
7fa3fbfe8b
|
Format the output of getLoad to two decimal places
|
2022-06-01 13:32:52 -04:00 |
|
Isaac Connor
|
8232a8801c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-05-30 15:50:32 -04:00 |
|
Isaac Connor
|
3bffc5a521
|
fix eslint
|
2022-05-30 14:31:02 -04:00 |
|
Isaac Connor
|
ce2cc33647
|
For Local Capturing Method, default to the only value in the array instead of the monitor default in order to prevent a warning. Fix CSP on the dropdown
|
2022-05-30 14:29:56 -04:00 |
|
Isaac Connor
|
b642632fc0
|
Give checkboxes and radio inputs more margin so that line heights are more like those with dropdowns
|
2022-05-30 14:29:06 -04:00 |
|
Isaac Connor
|
4e80114468
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2022-05-30 13:42:23 -04:00 |
|
Isaac Connor
|
36fadd8b16
|
remove connkey and set single image mode to start
|
2022-05-30 13:42:17 -04:00 |
|
Isaac Connor
|
b8bebda7d9
|
change weird behaviour of cycle. We were hiding the view if cycle was turned off, but it should be to show it if turned on. cycle is only on by request. Start in single image mode
|
2022-05-30 13:42:01 -04:00 |
|
Isaac Connor
|
994d2a1e16
|
remove global connkey as it's in the monitorData now
|
2022-05-30 13:41:05 -04:00 |
|
Isaac Connor
|
11a5273701
|
Use kill instead of stop to shutdown streams. Clean up cycle code
|
2022-05-30 13:40:47 -04:00 |
|
Isaac Connor
|
125f7f70e2
|
Implement CTRL-click to open event in a new tab/window
|
2022-05-30 13:40:21 -04:00 |
|
Isaac Connor
|
f16d57d915
|
Remove janus code, use MonitorStream now.
|
2022-05-30 13:39:20 -04:00 |
|
Isaac Connor
|
409e73c560
|
Don't set connkey, start in single jpeg mode
|
2022-05-30 13:38:55 -04:00 |
|
Isaac Connor
|
e0decbee2a
|
Deprecate old cycle view in favour of watch view with cycle turned on
|
2022-05-30 13:38:34 -04:00 |
|
Isaac Connor
|
b6f05d7017
|
Fixup style on status changes. Use .monitor.state instead of .Monitor .state
|
2022-05-30 13:37:58 -04:00 |
|
Isaac Connor
|
fe30192fb3
|
Whitespace
|
2022-05-30 10:23:05 -04:00 |
|
Isaac Connor
|
bddac1982c
|
Move monitor alarm styles into skin.css as they are used in other views now too
|
2022-05-30 10:15:23 -04:00 |
|
Isaac Connor
|
d7e4901a2d
|
When clicking cancel on zone edit, go back instead of reload
|
2022-05-30 10:13:09 -04:00 |
|
Isaac Connor
|
557e1e0641
|
imageFeed and monitor divs are sent by getStreamHTML so remove the duplication
|
2022-05-30 10:07:33 -04:00 |
|
Isaac Connor
|
6b450a4de7
|
remove debug
|
2022-05-30 10:03:45 -04:00 |
|
Isaac Connor
|
30efcc8854
|
fix jsdoc
|
2022-05-26 13:58:04 -04:00 |
|
Isaac Connor
|
72914ea47d
|
Use freeform_layout_id instead of Freeform when selecting layout
|
2022-05-26 12:59:27 -04:00 |
|
Isaac Connor
|
015744a665
|
Update styles so that alarmed images get red border
|
2022-05-26 12:27:52 -04:00 |
|
Isaac Connor
|
72be70f166
|
When using flat mode, only rename files that don't aleady include the event id. Turn off master.html if only video is being downloaded
|
2022-05-24 12:11:55 -04:00 |
|
Isaac Connor
|
0a3bb25a87
|
Don't allow setting progressbar to 0
|
2022-05-20 13:47:31 -04:00 |
|
Isaac Connor
|
0dd7539ce9
|
Add seconds after ExecuteInterval
|
2022-05-17 14:50:09 -04:00 |
|
Isaac Connor
|
db066f02c8
|
remove space. Fix eslint
|
2022-05-17 12:31:10 -04:00 |
|
Isaac Connor
|
a8a20bdddd
|
Use kill instead of stop when nav button clicked. Comment out onbeforeunload, it isn't working as expected or documented
|
2022-05-13 11:01:38 -04:00 |
|
Isaac Connor
|
e666452a83
|
Initial page load of montage should be single still images, with no connkey. Those will be added in js
|
2022-05-13 10:34:30 -04:00 |
|
Isaac Connor
|
94504df6fa
|
Add onbeforeunload event handler to killoff the streams so that the browser can actually go.
|
2022-05-13 10:34:02 -04:00 |
|
Isaac Connor
|
3410d85302
|
Make STATES const instead of VAR
|
2022-05-12 11:01:16 -04:00 |