Isaac Connor
|
ebb0c9eec6
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-14 13:56:30 -05:00 |
Isaac Connor
|
b5e0745ac7
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-14 13:56:03 -05:00 |
Isaac Connor
|
eeb7190812
|
fix rand replacing in image url
|
2018-02-14 13:16:30 -05:00 |
Isaac Connor
|
45bf4544ca
|
rename SetImageSource to getImageSource which is what it actually does
|
2018-02-14 11:58:47 -05:00 |
Isaac Connor
|
535cdf6485
|
When there isn't an event for the given moment, play the previous one. If still no events found, popup live
|
2018-02-13 11:27:55 -05:00 |
Isaac Connor
|
a82e17ff4b
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-12 17:16:33 -05:00 |
Isaac Connor
|
63a214869e
|
rework montagereview to be more performant.
|
2018-02-09 07:31:19 -08:00 |
Isaac Connor
|
cb9eef8563
|
show No streams found if none were found
|
2018-02-09 07:30:12 -08:00 |
Isaac Connor
|
dca1de4a13
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-08 13:30:57 -05:00 |
Isaac Connor
|
4777808cf0
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-02-08 13:15:41 -05:00 |
Isaac Connor
|
95cfdb327d
|
further separate addBtn and cloneBtn, fixes
|
2018-02-08 13:15:27 -05:00 |
Isaac Connor
|
4b6f40dd9f
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_monitor.cpp
|
2018-02-08 12:40:24 -05:00 |
Isaac Connor
|
4240dc4bde
|
spacing, add a test for minTime being after maxTime
|
2018-02-08 09:30:26 -08:00 |
Isaac Connor
|
cfe53c0ffe
|
Explicitly set the danger class on each line because they can get out of sync when using the All toggle
|
2018-02-08 09:57:11 -05:00 |
Isaac Connor
|
babae4629a
|
Update and fix console buttons. Use a separate button for clone
|
2018-02-08 09:47:16 -05:00 |
Isaac Connor
|
d8e4b0abfb
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
scripts/zmwatch.pl.in
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
src/zmc.cpp
|
2018-02-06 10:34:17 -05:00 |
Isaac Connor
|
e25af4b40c
|
cleanup, reset result
|
2018-02-02 16:07:13 -05:00 |
Isaac Connor
|
4b7ddd81bf
|
Merge branch 'storageareas' into zma_to_thread
|
2018-02-02 14:24:02 -05:00 |
Isaac Connor
|
a1392bf613
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_mpeg.cpp
src/zmc.cpp
|
2018-02-02 14:23:26 -05:00 |
Isaac Connor
|
060e6893cc
|
fix Storage dropdown population and don't clear value on line type change
|
2018-02-02 12:48:22 -05:00 |
Isaac Connor
|
132fff1931
|
An ok json return with no status is possible now
|
2018-01-31 14:35:48 -05:00 |
Isaac Connor
|
3ce46d3fed
|
Merge branch 'storageareas' into zma_to_thread
|
2018-01-29 15:55:05 -05:00 |
Isaac Connor
|
67b365948e
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_monitor.cpp
web/includes/Monitor.php
web/skins/classic/views/js/add_monitors.js
web/skins/classic/views/js/console.js
|
2018-01-29 15:53:26 -05:00 |
Isaac Connor
|
a60da6811b
|
revert adding custom port for status updates. It breaks in the non-multiserver case.
|
2018-01-29 15:17:22 -05:00 |
Isaac Connor
|
a76fcb331c
|
Remove debugging. Treat can't get semaphore as a non-error
|
2018-01-29 08:25:46 -08:00 |
Isaac Connor
|
dc6842bfbd
|
Add remote server port to monitor url
|
2018-01-29 07:32:40 -08:00 |
Isaac Connor
|
b793e6659b
|
add onFailure logger, and change link to chain so that responses don't just disappear
|
2018-01-29 07:32:02 -08:00 |
Isaac Connor
|
984d3a2dd1
|
add Monitor Name to the response listing the available camera feeds
|
2018-01-29 07:30:46 -08:00 |
Isaac Connor
|
dc46f23af0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-26 10:17:54 -08:00 |
Isaac Connor
|
9a15328894
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_event.cpp
|
2018-01-26 13:02:16 -05:00 |
Isaac Connor
|
d001ce467e
|
use get for status JSON requests
|
2018-01-26 10:31:55 -05:00 |
Isaac Connor
|
1e3cf9bbf8
|
handle no streams better
|
2018-01-25 09:14:21 -08:00 |
Isaac Connor
|
fb50f6f996
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-24 17:14:42 -08:00 |
Isaac Connor
|
215660a817
|
Merge branch 'storageareas' into zma_to_thread
Conflicts:
src/zm_ffmpeg_camera.cpp
src/zm_packetqueue.cpp
src/zm_videostore.cpp
src/zm_videostore.h
web/includes/Event.php
web/skins/classic/views/events.php
|
2018-01-24 11:06:19 -05:00 |
Isaac Connor
|
c7ecd580c1
|
Fix #81 by testing for non-numeric characters in LIMIT. Change type of input to number, making it harder to enter non-numeric characters
|
2018-01-24 10:27:01 -05:00 |
Isaac Connor
|
ea4937b75e
|
put back missing s
|
2018-01-23 17:47:24 -05:00 |
Isaac Connor
|
d9252e2d47
|
Merge branch 'storageareas' into tesla
|
2018-01-23 13:29:37 -08:00 |
Isaac Connor
|
0742217599
|
Only populate monitorNames if query is valid
|
2018-01-23 13:28:29 -08:00 |
Isaac Connor
|
994766fd50
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-22 13:25:38 -08:00 |
Isaac Connor
|
8a27ea3a04
|
Always populate the monitorNames object, and check for duplicate names when saving an existing Monitor as well as new monitors
|
2018-01-22 11:42:52 -05:00 |
Isaac Connor
|
b35e6adc8f
|
Merge branch 'storageareas' into zma_to_thread
|
2018-01-16 17:55:08 -05:00 |
Isaac Connor
|
573c44839a
|
Merge branch 'storageareas' into zma_to_thread
|
2018-01-16 17:39:37 -05:00 |
Isaac Connor
|
e78a40b45f
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-16 11:02:20 -08:00 |
Isaac Connor
|
27ebf1a4aa
|
Comment out debug code
|
2018-01-16 14:02:04 -05:00 |
Isaac Connor
|
bfa31297be
|
Merge branch 'storageareas' into tesla
|
2018-01-12 11:26:19 -08:00 |
Isaac Connor
|
c139f7a1bf
|
we don't need the group setting in the url
|
2018-01-12 11:24:52 -08:00 |
Isaac Connor
|
ff9f43b5a1
|
put back code to switch to add_monitors
|
2018-01-12 08:11:25 -08:00 |
Isaac Connor
|
666005fb5d
|
fix single event replay by fixing the reference to player which should be vid
|
2018-01-11 14:42:00 -05:00 |
Isaac Connor
|
b013da6b95
|
Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it.
|
2018-01-11 13:14:11 -05:00 |
Isaac Connor
|
834dfbfe0c
|
Merge branch 'storageareas' into zma_to_thread
|
2018-01-01 16:38:54 -05:00 |