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
|
498bceae0a
|
remove styles for svg circles
|
2016-04-08 13:44:20 -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
|
56a91ed4b2
|
rename monitor object from Monitor to monitor. Remove points in zone list.
|
2016-04-08 13:37:29 -04:00 |
|
Isaac Connor
|
8735f1ac73
|
convert to monitor object
|
2016-04-08 13:37:01 -04:00 |
|
Isaac Connor
|
11981efad2
|
add this back
|
2016-04-08 13:20:26 -04:00 |
|
Isaac Connor
|
6bb95beb9a
|
Merge branch 'svg_zones' into storageareas
|
2016-04-08 13:20:01 -04:00 |
|
Isaac Connor
|
34bfbb4708
|
blah
|
2016-04-08 13:18:13 -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
|
b4b622668c
|
fix merge
|
2016-04-06 08:39:47 -04:00 |
|
Isaac Connor
|
9a795432cf
|
merge all the commits from the messed up iconnor_video branch
|
2016-04-05 17:14:46 -04:00 |
|
Isaac Connor
|
60642c1fff
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-05 12:32:33 -04:00 |
|
Isaac Connor
|
238a25a302
|
Merge branch 'master' into iconnor_video
|
2016-04-05 09:38:59 -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
|
6c8e8368e1
|
rtsp should be lower case
|
2016-04-04 16:56:54 -04:00 |
|
Isaac Connor
|
564f189416
|
Merge branch 'always_show_ptz' into storageareas
|
2016-04-04 16:45:54 -04:00 |
|
Isaac Connor
|
868e5a51fa
|
Rename some of the columns names when laoding Control settings as they conflict with Monitor columns
|
2016-04-04 16:44:21 -04:00 |
|
Isaac Connor
|
711343a5cc
|
fix ZM_SERVER_ID instead of ZM_SERVER
|
2016-04-04 16:34:21 -04:00 |
|
Isaac Connor
|
ec6782a663
|
fix ZM_SERVER_ID instead of ZM_SERVER
|
2016-04-04 16:33:46 -04:00 |
|
Isaac Connor
|
6c92c0e3f7
|
Merge branch 'reload_stream_on_scale' into storageareas
|
2016-04-04 16:13:35 -04:00 |
|
Isaac Connor
|
98fce7c3c6
|
Merge branch 'reload_stream_on_error' into storageareas
|
2016-04-04 16:13:26 -04:00 |
|
Isaac Connor
|
bc9760ce79
|
Merge branch 'master' into storageareas
|
2016-04-04 16:13:17 -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
|
5f3e7134fb
|
split power out of the Panel box so that I can style it better
|
2016-04-04 13:22:26 -04:00 |
|
Isaac Connor
|
f91ff4503a
|
rework the ptz controls to take up less vertical space, also don't set width of buttons
|
2016-04-04 13:20:04 -04:00 |
|
Isaac Connor
|
02eb36040a
|
fix bad code
|
2016-04-04 12:01:37 -04:00 |
|
Isaac Connor
|
faa75bbe39
|
fix wrong brace and needs quotes
|
2016-04-04 12:00:29 -04:00 |
|
Isaac Connor
|
b3f0f5d0e8
|
Merge branch 'updated-console' into storageareas
|
2016-04-04 11:51:07 -04:00 |
|
Isaac Connor
|
197ae67313
|
Merge branch 'always_show_ptz' into storageareas
|
2016-04-04 11:47:29 -04:00 |
|
Isaac Connor
|
3e20e5f21c
|
fix ptz control box size
|
2016-04-04 11:40:01 -04:00 |
|
Isaac Connor
|
9dfe71ceb8
|
Always show events and always show ptz controls. Also clean out some commented out cruft
|
2016-04-04 11:39:12 -04:00 |
|
Isaac Connor
|
2233747fcb
|
add a missing t
|
2016-04-04 11:38:16 -04:00 |
Isaac Connor
|
43e4052dd9
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-04-04 11:36:03 -04:00 |
|
Isaac Connor
|
dd153d8efb
|
add header.php to autotools build
|
2016-04-04 11:35:51 -04:00 |
|
Isaac Connor
|
c8fa0a9b4f
|
Merge branch 'master' into feature-h264-videostorage
|
2016-04-04 10:14:15 -04:00 |
|
Isaac Connor
|
b3c7002eca
|
install view_video as well
|
2016-04-01 15:44:37 -04:00 |
|
Isaac Connor
|
96aa20fb79
|
value should be lower case when checking for rtsp
|
2016-04-01 15:43:59 -04:00 |
|
Isaac Connor
|
8a2605578a
|
fix type in htmlSelect
|
2016-04-01 15:43:40 -04:00 |
|
Isaac Connor
|
d71eaa66ec
|
use view_video.php as a short-term fix for viewing video
|
2016-04-01 15:43:31 -04:00 |
|
Isaac Connor
|
5f6d140de5
|
Load all event fields, so we know we have them deeper in the code.
|
2016-04-01 14:07:27 -04:00 |
|
Isaac Connor
|
ca96481036
|
fix thumbnail generation from video file
|
2016-04-01 13:02:31 -04:00 |
|
Isaac Connor
|
cbebdfe670
|
add Time function to get unixtime from StartTime
|
2016-04-01 13:00:59 -04:00 |
|
Isaac Connor
|
82b32578ec
|
Merge branch 'master' into iconnor_video
|
2016-04-01 12:54:09 -04:00 |
|
Isaac Connor
|
6ebd71f980
|
instead of loading and looking at current recording settings, check to see if the images exist. If not, generate them from the video file
|
2016-04-01 12:51:09 -04:00 |
|
Isaac Connor
|
6816a4c75b
|
Merge branch 'iconnor_video' into storageareas
|
2016-04-01 11:35:38 -04:00 |
|
Isaac Connor
|
a2e228a5ca
|
put quotes aroudn the string
|
2016-04-01 11:01:16 -04:00 |
|
Isaac Connor
|
59bf780537
|
introduce htmlSelect as a better version of buildSelect
|
2016-04-01 10:35:59 -04:00 |
|
Isaac Connor
|
3140905d02
|
whitespace and structure changes to match google coding style. Use new htmlSelect function to build the select dropdowns. Use a monitor object instead of a newMonitor array
|
2016-04-01 10:35:34 -04:00 |
|
Isaac Connor
|
c074f6e0bf
|
Add a set function to take an array of value to set in the Object
|
2016-04-01 10:34:40 -04:00 |
|
Isaac Connor
|
abcf48b65c
|
Merge branch 'master' into feature-h264-videostorage
|
2016-04-01 08:53:45 -04:00 |
|
Isaac Connor
|
e7ee464a17
|
Add a RecordAudio setting to the Storage Tab
|
2016-03-31 15:50:44 -04:00 |
|
Isaac Connor
|
c9a1a9020d
|
Merge h264
|
2016-03-31 11:03:36 -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
|
e5a36c02bd
|
Merge remote-tracking branch 'origin/master' into video_remote
|
2016-03-30 16:55:24 -04:00 |
|
Isaac Connor
|
89e70b324d
|
add boostrap
|
2016-03-30 14:28:27 -04:00 |
|
Isaac Connor
|
ea49dc20d1
|
Merge branch 'master' into storageareas
|
2016-03-30 10:58:07 -04:00 |
|
Isaac Connor
|
e9c65785e8
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
|
2016-03-30 10:56:53 -04: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 |
|
Isaac Connor
|
50f9241c14
|
When no Id is specified, default to ZM_DIR_EVENTS
|
2016-03-29 15:38:53 -04:00 |
|
Isaac Connor
|
1b69299c2d
|
Include Monitor object so it can be used elsewhere
|
2016-03-29 14:36:42 -04:00 |
|
Isaac Connor
|
0ab6e27259
|
Use Monitor object
|
2016-03-29 14:35:12 -04:00 |
|
Isaac Connor
|
cfa11b95dc
|
Add missing Server and Storage Area filters
|
2016-03-29 12:27:23 -04:00 |
|
Isaac Connor
|
d91045319d
|
Use Event object delete method in deleteEvent
|
2016-03-29 12:07:13 -04:00 |
|
Isaac Connor
|
c309cdaad4
|
include Event object so it can be used elsewhere
|
2016-03-29 12:06:51 -04:00 |
|
Isaac Connor
|
f0a307e082
|
Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas
Conflicts:
distros/ubuntu1504_cmake/control
|
2016-03-29 11:53:17 -04:00 |
|
Isaac Connor
|
1ea1852476
|
Do some Storage Areas support
|
2016-03-29 11:52:25 -04:00 |
|
Isaac Connor
|
655116eea9
|
add LinkPath and delete methods
|
2016-03-29 11:49:15 -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 |
|
Isaac Connor
|
757740ede5
|
Move skin and css changing up above the include of header.php so that the set cookie call will work
|
2016-03-23 16:12:51 -04:00 |
|
Isaac Connor
|
dd06db0bf0
|
remove duplication
|
2016-03-23 15:54:20 -04:00 |
|
Isaac Connor
|
a66e97de09
|
Merge & fix new console & options
|
2016-03-23 09:48:57 -04:00 |
|
Isaac Connor
|
3a8352eb6b
|
Merge branch 'master' into storageareas
|
2016-03-21 10:25:03 -04: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 |
Kyle Johnson
|
897a0a995c
|
Convert options layout to side-tabs, and improve readability
|
2016-03-15 15:21:28 -04:00 |
|
Kyle Johnson
|
87932002cf
|
Push the options page down a bit to make tab look better
|
2016-03-15 14:45:40 -04:00 |
|
Kyle Johnson
|
183f58ad17
|
Restyle options view with horizontal form layout
|
2016-03-15 14:43:22 -04:00 |
|
Kyle Johnson
|
694ad0b539
|
Add styling to delete / save / add buttons in options.php
|
2016-03-15 14:08:01 -04:00 |