arjunrc
2888142e68
added status command to retrieve alarmed status of monitor in addition to on/of
2016-05-10 16:55:43 -04:00
Steve Gilvarry
c0d3d69bec
Merge pull request #1420 from connortechnology/fix_event_menubars
...
remove set height on the menu bars, fixing flow issues
2016-05-10 16:55:06 +10:00
Steve Gilvarry
b03d2660cb
Merge pull request #1455 from ZoneMinder/api_servers
...
rough in Server object support
2016-05-10 08:00:58 +10:00
Steve Gilvarry
cffcbc6357
Merge pull request #1462 from ZoneMinder/merge_storageareas
...
Merge object model classes from storageareas
2016-05-10 07:59:25 +10:00
Isaac Connor
41776547cb
Merge branch 'master' into fix_zone_edit
2016-05-09 12:33:05 -04:00
Joshua Ruehlig
e12160456b
Support user defined MySQL Port/Socket in API
2016-05-09 00:24:08 -07:00
Isaac Connor
966a9dcd8d
Merge pull request #1467 from ZoneMinder/api_fixes
...
Don't pass request data as a monitor array to daemonControl
2016-05-07 18:25:35 -04:00
Isaac Connor
e35b0a1eb2
Merge pull request #1469 from pliablepixels/1468-api-consoleEvents-alarmedFrames
...
added alarmed frames filter
2016-05-07 17:06:37 -04:00
arjunrc
be329e1e0d
switched to named param format, more flexible, in line with other APIs
2016-05-07 16:28:25 -04:00
arjunrc
8347b69b09
added alarmed frames filter
2016-05-07 14:26:09 -04:00
Isaac Connor
6d991a1c6c
Merge pull request #1466 from pliablepixels/1465-api-alarm-on-off
...
added alarm enable/disable
2016-05-07 11:26:49 -04:00
arjunrc
6f9cc0f19f
to be safe, lets add system edit permissions, so rogue users can't turn alarms OFF
2016-05-07 11:01:03 -04:00
Isaac Connor
15977f1a3c
Don't pass request data as a monitor array to daemonControl
2016-05-07 10:56:38 -04:00
arjunrc
0280ae4dd5
added alarm enable/disable
2016-05-07 10:37:42 -04:00
Isaac Connor
c050969141
Merge object model classes from storageareas
2016-05-05 15:33:28 -04:00
Isaac Connor
01aa2c9319
change permissions to stream permissions for view
2016-05-02 19:48:24 -04:00
Isaac Connor
75f9fde920
rough in Server object support
2016-05-02 10:41:25 -04:00
Steve Gilvarry
da157f5a1a
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-04-30 22:27:10 +10:00
Isaac Connor
ce69f24bdd
use zm.conf values for database connection
2016-04-30 08:11:39 -04:00
Isaac Connor
532fb77ecb
As well as writing zm.conf contents into the Configure object, define them, like we do in the regular UI. Also remove unneeded quotes
2016-04-30 08:09:56 -04:00
Isaac Connor
be5f0cd4a9
replace OutputVideoStream and OutputImageStream with versions that return a string. Call getStreamHTML before we output the headers because we use streamMode and streamSrc in the header .js.php
2016-04-29 10:44:46 -04:00
Steve Gilvarry
513d1568d0
Merge pull request #1444 from ZoneMinder/handle_disk_free_space_error
...
handle disk_free_space error
2016-04-29 21:36:29 +10:00
Isaac Connor
c4410c512a
Merge branch 'master' into fix_event_menubars
2016-04-28 09:35:58 -04:00
Isaac Connor
5e20831030
Don't return of disk_free_space returns false, just log it.
2016-04-28 09:29:40 -04:00
Steve Gilvarry
ac5fdb8956
Merge pull request #1421 from connortechnology/fix_events_pagination
...
remove the if(pages>1) so that the if > line always happens
2016-04-28 21:43:54 +10:00
Isaac Connor
d847d66e99
handle disk_free_space error
2016-04-26 14:40:40 -04:00
Andrew Bauer
fe9cb4b7ec
Merge pull request #1442 from ZoneMinder/fix_rotate
...
Fix rotate
2016-04-26 09:54:01 -05:00
Isaac Connor
85798932ee
Use Event Width and Height, not the Monitor Width and Height. THe Monitor dimensions are not rotated
2016-04-25 14:10:26 -04:00
Isaac Connor
fed575bdb4
add some missing () on class method calls. Remove some no longer needed global 's and some empty lines
2016-04-25 08:56:21 -04:00
Andrew Bauer
81757a0465
Merge pull request #1418 from pliablepixels/1417-clone-monitor
...
Clone feature added
2016-04-20 13:02:10 -05:00
Isaac Connor
b2d02a64f4
reload stream after error
2016-04-19 12:02:58 -04:00
Isaac Connor
50f2747bb4
remove the if(pages>1) so that the if > line always happens
2016-04-15 16:11:53 -04:00
Isaac Connor
2b05815bfa
remove set height on the menu bars, fixing flow issues
2016-04-15 15:44:35 -04:00
Isaac Connor
ccb5ea766d
add the toggle for RecordAudio so that the checkbox works to turn off Audio
2016-04-15 13:16:52 -04:00
arjunrc
804ac1de81
Clone feature added
2016-04-14 13:53:10 -04:00
Isaac Connor
851a81eff7
Merge pull request #1406 from ZoneMinder/svg_zones
...
replace the static zone image with a stream, and use SVG to draw the zones
2016-04-11 11:14:11 -04:00
Isaac Connor
67abf91925
add a view to check auth and just send the video
2016-04-11 10:31:51 -04:00
Isaac Connor
d493ca69a9
Merge branch 'master' into icon_video
2016-04-11 09:31:51 -04:00
Andrew Bauer
5542788a45
make cannot write to content dir an error, rather than fatal
2016-04-10 18:45:38 -05:00
Andy Bauer
39a30ff51b
refresh parent when cancel is clicked
2016-04-10 15:59:13 -05:00
Andy Bauer
e5bf2d245c
quit the stream in zones.php when zone.php is called
2016-04-10 15:33:55 -05:00
Andy Bauer
fbb2a527e6
remove setButtonState. it is not needed.
2016-04-10 07:55:45 -05:00
Andy Bauer
988d611d03
remove unused code
2016-04-09 21:37:00 -05:00
Andy Bauer
e7d35d16bc
add monitor alarm state and fps to zone edit view
2016-04-09 21:34:30 -05:00
Isaac Connor
c0c543e029
change quotes to prevent php7 complaint
2016-04-09 11:25:56 -04:00
Isaac Connor
0c8e0ac220
change quotes to prevent php7 complaint
2016-04-09 11:24:59 -04:00
Isaac Connor
feb7b36f11
use a local variable to prevent modifying the arguments
2016-04-09 11:23:52 -04:00
Isaac Connor
ce6f8da098
Use PDO::error_string instead of mysql_error
2016-04-09 11:23:35 -04:00
Isaac Connor
e90024c0d0
Better Error logging on disk_total_space failure
2016-04-09 09:27:12 -04:00
Isaac Connor
6d27a857aa
put a zones class on the svg
2016-04-08 14:38:50 -04:00
Isaac Connor
c73e768f1f
put in the onclick for the zone to open the edit page
2016-04-08 14:25:19 -04:00
Isaac Connor
b10c6ee093
fix Monitor capitalisation
2016-04-08 14:23:44 -04:00
Isaac Connor
758a0341ce
convert monitor to object
2016-04-08 14:09:59 -04:00
Isaac Connor
bbd33cc159
add monitor class so we don't have to everywhere else
2016-04-08 13:56:49 -04:00
Isaac Connor
22f207602b
add css for the svg zones
2016-04-08 13:43:00 -04:00
Isaac Connor
f749ff47ea
convert to monitor object
2016-04-08 13:40:32 -04:00
Isaac Connor
0ce85137dc
remove points. Don't need them here
2016-04-08 13:39:31 -04:00
Isaac Connor
f20945bf84
update zone points in SVG
2016-04-08 13:13:10 -04:00
Isaac Connor
7da6e1e5a1
use stream for image, add SVG polygon
2016-04-08 12:36:09 -04:00
Isaac Connor
256df08af4
update SVG polygon points on point update
2016-04-08 12:32:26 -04:00
Isaac Connor
45d58c3ad6
convert points to circles, because squares are not centered on the point.. but a circle is
2016-04-08 11:17:16 -04:00
Isaac Connor
79552e5393
use new getStreamHTML
2016-04-08 11:11:09 -04:00
Isaac Connor
3056069f3f
introduce getStreamHTML which returns the required HTML to give you a live image
2016-04-08 11:06:34 -04:00
Isaac Connor
3be3a3ada2
convert the monitor variable to a Monitor object, replace the static zone image with a stream, and use SVG to draw the zones
2016-04-08 10:46:51 -04:00
Isaac Connor
7491aa4381
fix spelling mistake
2016-04-06 10:55:11 -04:00
Isaac Connor
45f61b503b
add these back
2016-04-06 10:53:28 -04:00
Isaac Connor
9a795432cf
merge all the commits from the messed up iconnor_video branch
2016-04-05 17:14:46 -04:00
SteveGilvarry
4d7ded5ef0
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
configure.ac
src/Makefile.am
web/js/Makefile.am
2016-04-05 22:06:14 +10:00
Andrew Bauer
a0e6c004a2
Merge pull request #1388 from ZoneMinder/reload_stream_on_error
...
try to reload the image stream on error.
2016-04-04 20:57:48 -05:00
Andy Bauer
4e9a925933
Merge branch 'Autotools_delete' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-Autotools_delete
2016-04-04 20:52:49 -05:00
Andy Bauer
7ff8d36598
Merge branch 'depracation_nation' of https://github.com/SteveGilvarry/ZoneMinder into SteveGilvarry-depracation_nation
2016-04-04 20:44:53 -05:00
Andrew Bauer
ab6758de45
Merge pull request #1387 from ZoneMinder/reload_stream_on_scale
...
reload stream on scale change
2016-04-04 20:32:53 -05:00
Isaac Connor
711343a5cc
fix ZM_SERVER_ID instead of ZM_SERVER
2016-04-04 16:34:21 -04:00
Isaac Connor
123a1a898a
try to reload the image stream on error.
2016-04-04 15:04:09 -04:00
Isaac Connor
0b13f9d76f
reload stream on scale change
2016-04-04 14:58:07 -04:00
Isaac Connor
02eb36040a
fix bad code
2016-04-04 12:01:37 -04:00
Isaac Connor
c8fa0a9b4f
Merge branch 'master' into feature-h264-videostorage
2016-04-04 10:14:15 -04:00
Isaac Connor
abcf48b65c
Merge branch 'master' into feature-h264-videostorage
2016-04-01 08:53:45 -04:00
Laercio Motta
ad912a6c6b
Improve test multiserver restart camera. (FIX)
...
Check if the server is correctly before restart cam and multiserver is activate.
2016-03-31 09:45:13 -03:00
Laercio Motta
2f27818e5b
Improve test multiserver restart cam.
...
Test if correct server from camera edit settings.
2016-03-31 09:23:01 -03:00
Isaac Connor
247cb3d0b2
Merge pull request #1360 from schrorg/monitornames-spaces
...
Allow spaces in monitor names
2016-03-30 09:17:57 -04:00
Robin Daermann
c8c0586c66
Trim monitor names
2016-03-29 11:40:14 +02:00
Andrew Bauer
ab05d52a0a
Update en_gb.php
...
typo
2016-03-28 08:35:34 -05:00
Andy Bauer
6eda3eff72
do not set maxfps fields during onvif probe
2016-03-26 08:38:28 -05:00
Robin Daermann
af68fd20a8
Some Translations for Monitor names with spaces
2016-03-24 14:51:24 +01:00
Robin Daermann
71db9b84e6
Allow spaces in monitor names
2016-03-24 14:37:24 +01:00
Jon Burgess
9c98ccbb75
Fix spelling in ffmpeg options help: s/verbosiy/verbosity/
2016-03-20 16:13:53 +00:00
Jon Burgess
020731a89e
Fix typo in ffmpeg options help: s/passwd/passed/
2016-03-20 16:10:49 +00:00
arjunrc
8a47241e18
address issue #1335
2016-03-12 08:07:25 -05:00
Andrew Bauer
77f7a3642c
remove check for "selected" property
2016-03-09 10:34:06 -06:00
Andrew Bauer
3280aff876
disable save button when nothing slected. fixes #1322
2016-03-09 09:43:44 -06:00
SteveGilvarry
24ebc33ea4
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-03-09 20:54:11 +11:00
Andy Bauer
466f2b2ae3
change multi-server error message text
2016-03-01 11:12:54 -06:00
arjunrc
84801fcb86
typo in function name
2016-02-27 13:06:33 -05:00
SteveGilvarry
3ce620eb89
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2016-02-27 19:46:56 +11:00
SteveGilvarry
d40bf89b17
Remove Phone BW settings used with mobile skin
2016-02-26 22:43:37 +11:00
SteveGilvarry
4837585601
Deleted eyezm options documentation and references to it in other areas of documentation. Removed zmstreamer.cpp.
...
Conflicts:
src/zmstreamer.cpp
2016-02-26 22:37:23 +11:00
SteveGilvarry
7c7d7b245c
Remove the XML skin folder
2016-02-26 22:30:20 +11:00
SteveGilvarry
e6d57da0d4
Remove the mobile skin folder
2016-02-26 22:29:41 +11:00
SteveGilvarry
5ff427d9e9
Removed Autotools Makefile.am
...
Conflicts:
Makefile.am
misc/Makefile.am
src/Makefile.am
web/includes/Makefile.am
web/js/Makefile.am
web/skins/classic/css/classic/views/Makefile.am
web/skins/classic/css/flat/views/Makefile.am
web/skins/classic/views/Makefile.am
web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
SteveGilvarry
b294f210dc
Update to CakePHP 2.8.0 copy in lib folder
2016-02-25 23:25:24 +11:00
Dmitry Smirnov
632e9c8e53
Upgrade bundled jQuery ( Closes : #1263 )
...
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2016-02-18 00:28:30 +11:00
Isaac Connor
172a4c6bd4
Add montagereview.php to autotools build.
2016-02-16 09:29:49 -05:00
Isaac Connor
5f217b48e0
When Protocol is HTTP, hide the RTSPDescribe line. Make it appear when Protocol is changed to RTSP
2016-02-12 13:52:59 -05:00
Andrew Bauer
0b2a309014
Merge pull request #961 from Linwood-F/960-montage-review-new-feature
...
960 montage review new feature
2016-02-08 20:40:04 -06:00
Isaac Connor
d3755611c5
Merge pull request #1247 from bodegard/master
...
Corrected DB update version comments, fixed typos, and skin font modification
2016-02-04 11:54:02 -05:00
Andrew Bauer
ab7b4ab3e6
Merge pull request #1221 from ZoneMinder/rotate_dimensions_when_image_is_rotated
...
implement Width and Height functions, and test for image rotation and…
2016-02-04 10:17:19 -06:00
Andrew Bauer
1c142a48a6
Merge pull request #1212 from RBxx/patch-1
...
Convert ru_ru.php to UTF-8
2016-02-04 10:16:24 -06:00
Andrew Bauer
cbe88d0a3f
Merge pull request #1239 from ZoneMinder/trim_when_saving
...
use trim on values when saving.
2016-02-04 08:29:02 -06:00
SteveGilvarry
7301e803ed
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
2016-01-30 15:45:08 +11:00
Andrew Bauer
2f80f26f92
Merge pull request #1232 from ZoneMinder/remove_google_fonts
...
remove Google open Sans external import
2016-01-23 10:24:49 -06:00
Brandon Odegard
54a11175ff
Reduce default size of body font in Flat skin
2016-01-22 13:56:41 -06:00
Brandon Odegard
1ca9ace84d
Fixed missing semicolons
2016-01-22 13:31:02 -06:00
Isaac Connor
4520902dd2
use trim on values when saving.
2016-01-14 09:37:41 -05:00
Isaac Connor
3ebeaec8ab
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2016-01-10 20:59:01 -05:00
Isaac Connor
2d86e7713d
increase height of logout popup to fit content
2016-01-08 12:14:01 -05:00
Isaac Connor
d48ec1cfbe
Add AddNewServer and Hostname entries
2016-01-08 10:15:41 -05:00
Isaac Connor
99dfaa97fa
User Name instead of ServerName and Hostname instead of ServerHostname
2016-01-08 10:15:21 -05:00
Isaac Connor
d13829c6f3
Add Hostname to list of servers, since we have the space for it.
2016-01-08 10:15:06 -05:00
Isaac Connor
53bd342f85
remove Google open Sans external import
2016-01-08 09:46:14 -05:00
Isaac Connor
44f3b99d24
change logic to show server column if any servers are defined. Reason is that once you have setup 1, you want to know which cameras have not been assigned a server yet
2016-01-04 14:59:04 -05:00
Isaac Connor
6ae1597671
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2016-01-04 14:51:47 -05:00
Isaac Connor
273ab6c5c6
Only show Server column when more than 1 Servers are defined
2016-01-04 14:51:24 -05:00
Isaac Connor
f5db14d823
return empty for the non multi-server case
2016-01-04 13:46:05 -05:00
Isaac Connor
45fc689203
implement Width and Height functions, and test for image rotation and output opposite dimension. Fixes #1220
2016-01-04 13:15:50 -05:00
Isaac Connor
f72260733c
Only do CORSHeaders if there is more than 1 server
2016-01-04 09:38:24 -05:00
Isaac Connor
d256530896
return early if no servers are defined instead of logging a warning
2016-01-04 09:36:45 -05:00
Isaac Connor
c639822d62
When Server is not set, us ZM_BASE_PATH
2016-01-03 11:55:53 -05:00
Isaac Connor
bd71c4999d
test for Server in servers_by_Id as well as just having a value for ServerId. Fixup export as well.
2016-01-02 14:36:37 -05:00
Isaac Connor
cf7e168872
Fix populating the server filter and then fix filtering by server. Also introduce robustness and consolel ogging when a filter doesn't exist
2016-01-01 17:10:37 -05:00
Isaac Connor
468f997e4c
Soft error, with logging when the filter element doesn't exist
2016-01-01 16:36:29 -05:00
Isaac Connor
ec7504f925
Translate ServerId to Server in Log record before sending back
2016-01-01 16:33:28 -05:00
Isaac Connor
12ee147bc7
Add a find_all function to return an array of Server objects
2015-12-31 10:13:48 -05:00
Isaac Connor
bfe4175fdf
Add Server to filters and log results
2015-12-31 10:13:25 -05:00
Isaac Connor
31ba0221ed
Add Server to filters and log results
2015-12-31 10:13:03 -05:00
Isaac Connor
983b47f6dc
Add Server columns
2015-12-31 09:09:57 -05:00
RBxx
0ccce76ef8
Convert ru_ru.php to UTF-8
...
In koi8-r encoding, some menu items are not displayed in the web interface. With UTF-8 encoding all displayed correctly.
2015-12-31 16:58:56 +03:00
SteveGilvarry
1ff2043774
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-12-23 19:24:08 +11:00
Isaac Connor
6df1425897
Slight update to allow the instantiation with no row or Id
2015-12-22 09:52:33 -05:00
Isaac Connor
1aa79c306b
Merge branch 'multi-server' of github.com:ZoneMinder/ZoneMinder into multi-server
2015-12-22 09:47:45 -05:00
Isaac Connor
658e130d33
sync up to c39 version
2015-12-22 09:44:46 -05:00
Isaac Connor
dfd7986c01
Merge branch 'master' into multi-server
...
Conflicts:
distros/debian_cmake/links
distros/ubuntu1504_cmake/zoneminder.postinst
2015-12-21 12:57:45 -05:00
Isaac Connor
6f5c70dd5d
Add Attr lines for ServerId and ServerName
2015-12-21 10:10:11 -05:00
Isaac Connor
b626712a2f
Add ServerId and ServerName to fields that we can filter on
2015-12-21 10:03:48 -05:00
Isaac Connor
37212dcf2e
Merge pull request #1196 from pliablepixels/api-more-security
...
Api more security
2015-12-20 10:22:40 -05:00
SteveGilvarry
e28e3c2b75
Merge branch 'master' into feature-h264-videostorage
2015-12-20 14:13:30 +11:00
arjunrc
6e606aa74b
removed issue #
2015-12-19 19:04:27 -05:00
arjunrc
38b4785557
PP - Gone,flitted away, Taken the starts from the night and sun, From the day! Gone, and a cloud in my heart. - Tennyson
2015-12-19 18:36:38 -05:00
arjunrc
c4461c328e
initial user role support
2015-12-19 17:45:03 -05:00
arjunrc
b4fdaa9b4d
initial user role support
2015-12-19 17:44:46 -05:00
arjunrc
e812398fb9
initial user role support
2015-12-19 17:44:39 -05:00
arjunrc
f56688e7c2
initial user role support
2015-12-19 17:44:16 -05:00
arjunrc
028c9b956c
check for opt_use_api, also pull in user roles support
2015-12-19 17:44:02 -05:00
Andy Bauer
e5f243a9f8
Merge branch 'maxfps' of https://github.com/knnniggett/ZoneMinder into knnniggett-maxfps
2015-12-19 08:16:20 -06:00
Steve Gilvarry
e3d634e53e
Merge pull request #1182 from ZoneMinder/one_eighth
...
add a 1/8th scale option, which is useful for 1920x1080 streams
2015-12-19 14:07:18 +11:00
Isaac Connor
983d87f69b
increase height and width of groups window to fit buttons in
2015-12-18 13:34:44 -05:00
Isaac Connor
ca45ac23fa
increase height of group edit window
2015-12-18 13:30:42 -05:00
Isaac Connor
aaa9f3bcc9
Handle case where parameter is not passed to constuctor
2015-12-15 11:19:50 -05:00
Isaac Connor
6cfd993890
Merge branch 'master' into multi-server
2015-12-09 10:43:38 -05:00
Isaac Connor
53dec9f26d
check for setting of __REQUEST['object'] to silence php NOTICE
2015-12-09 10:43:23 -05:00
Isaac Connor
6d34f8f424
Use Monitor class instead of old sql
2015-12-09 09:23:42 -05:00
Isaac Connor
e6c9830728
Use Monitor class instead of old sql
2015-12-09 09:23:36 -05:00
Isaac Connor
f2065e2fcb
Merge branch 'one_eighth' into multi-server
2015-12-08 08:47:35 -05:00
Isaac Connor
d6b2e1959f
add a 1/8th scale option, which is useful for 1920x1080 streams
2015-12-08 08:40:44 -05:00
Isaac Connor
3c86965760
Merge branch 'master' into multi-server
...
Conflicts:
web/skins/classic/js/flat.js
2015-12-04 15:31:30 -05:00
Isaac Connor
f54b8c27ee
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:32 -05:00
Isaac Connor
34f6590107
upgrade montage to use Monitor object and getStreamSrc which knows which server to connect to
2015-12-02 12:10:26 -05:00
Isaac Connor
961dc90b0e
add Server function
2015-12-02 11:21:04 -05:00
Isaac Connor
b8fb711593
only do CORS if Origin is set
2015-12-02 11:02:47 -05:00
Isaac Connor
41d92bbf94
need to include Server class
2015-12-02 10:26:11 -05:00
Isaac Connor
62adb756a9
put back CORS validity checking code
2015-12-02 10:12:20 -05:00
Isaac Connor
644080fd41
call CORSHeaders
2015-12-02 10:05:27 -05:00
Isaac Connor
3f8a45bbbb
Add a function to setup CORS access headers
2015-12-02 10:05:03 -05:00
Isaac Connor
a799a1ce79
Make Server constructor take a row or an id
2015-12-02 10:04:47 -05:00
Isaac Connor
aa91e69a9b
add monitorUrl to be used to target the recording server for the monitor
2015-12-01 15:17:49 -05:00
Isaac Connor
342326e159
append monitorUrl to thsiURL to get access to the recording server for the monitor stream
2015-12-01 15:17:25 -05:00
Isaac Connor
95f002c7d6
convert monitor hash accesses to function calls
2015-12-01 15:16:53 -05:00
Isaac Connor
c5d57b5b64
convert monitor hash accesses to function calls
2015-12-01 15:16:43 -05:00
Isaac Connor
945949ebc0
fix __call to actually return the value
2015-12-01 15:16:18 -05:00
Isaac Connor
2dfa6d6bae
add Url and __call functions
2015-12-01 15:16:07 -05:00
Isaac Connor
382ad0f390
put () after property names of Monitor object
2015-12-01 14:30:24 -05:00
Isaac Connor
e85ba683e1
improve constructor to handle numeric as well, and give error when something else
2015-12-01 14:29:57 -05:00
Isaac Connor
e4f5f76782
rewrite constructor to take a row as well as an Id
2015-12-01 14:03:55 -05:00
SteveGilvarry
220ee5e516
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
2015-11-29 13:17:22 +11:00
Isaac Connor
c2a7e0c587
fix size of monitor popup in flat skin
2015-11-25 15:39:46 -05:00
Isaac Connor
f7cc2fb44f
Merge branch 'master' into multi-server
...
Conflicts:
src/zm_monitor.cpp
2015-11-23 10:42:14 -05:00
Isaac Connor
4d6c4355db
Merge branch 'master' into multi-server
2015-11-20 16:07:50 -05:00
Heng Liu
5ea11a8bfe
use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event
...
also fixed bug which prevented seeking in timeline video preview
2015-11-18 21:21:56 -08:00
Kyle Johnson
c0216f74cb
Merge pull request #1164 from abishai/master
...
compat for php 5.4. Fixes #1163
2015-11-16 09:28:03 -07:00
Kyle Johnson
5add10289b
Merge pull request #1136 from pliablepixels/1135-events-API-prev-next
...
added prev/next event ids
2015-11-16 09:23:36 -07:00
abishai
551194227d
compat for php 5.4
2015-11-15 21:40:25 +00:00
Isaac Connor
a0d4934b84
Have PDO actually throw exceptions on db errors. Prior to this it would have been just failing silently. Also, fix a . to -> in the exception catcher.
2015-11-11 16:56:28 -05:00
Isaac Connor
fc85ccbf5f
Set value for Hostname to avoid php warning. fix save button. Can't use it to pass action value because it gets translated.
2015-11-11 16:43:23 -05:00
Heng Liu
4e263f5913
Merge branch 'master' into feature-h264-videostorage
...
Conflicts:
src/zm_ffmpeg.h
2015-11-04 14:39:52 -08:00
Pliable Pixels
7cbad44ae4
also return the prev and next events for the same monitor as the current event
2015-11-04 14:23:28 -05:00
Pliable Pixels
e3d06ca103
added prev/next event ids
2015-11-02 16:54:52 -05:00
Heng Liu
05a2445b7a
better way of detecting showing image or video in timeline and event view
...
instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view
this also fixes loading videos in timeline view
2015-10-24 22:22:52 -07:00
Andy Bauer
cb7acb36ab
Use relative URL's instead of absolute
2015-10-24 13:04:54 -05:00
SteveGilvarry
d8494aba2d
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
...
Conflicts:
src/zm_monitor.cpp
src/zm_monitor.h
src/zm_remote_camera_rtsp.h
web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
Isaac Connor
2237391876
white spacing, and fix loading of Server objects in monitor
2015-10-15 09:28:35 -04:00