Isaac Connor
|
be7683299e
|
use single quotes instead of double quotes
|
2016-08-22 11:49:45 -04:00 |
|
Isaac Connor
|
09ebcfb7f8
|
only put in the development h3 tag if the value has been set
|
2016-08-22 11:42:44 -04:00 |
|
Isaac Connor
|
707694d4ea
|
google code style
|
2016-08-22 11:41:26 -04:00 |
|
Isaac Connor
|
d6b126fe8c
|
Add caller and line when an unknown function is called on the Monitor object
|
2016-08-22 11:28:53 -04:00 |
|
Isaac Connor
|
eafe3d7748
|
Merge branch 'master' into storageareas
|
2016-08-17 10:31:55 -04:00 |
|
Isaac Connor
|
c82c872665
|
add a default NULL value to __construct
|
2016-08-17 10:31:16 -04:00 |
Isaac Connor
|
69461a7c1b
|
Merge pull request #1579 from peruchi/master
Update file sock for multiserver
|
2016-08-17 10:23:01 -04:00 |
|
Isaac Connor
|
714c551359
|
Add some more fields relating to ptz controls that should be able to be NULL
|
2016-08-17 09:39:55 -04:00 |
Andrew Bauer
|
7d48b2c6c5
|
Merge pull request #1577 from ZoneMinder/fix_zmaControl
fix error in calling zmaControl
|
2016-08-17 08:36:51 -05:00 |
peruchi
|
50f55af68f
|
Update zmdc.pl.in
|
2016-08-17 10:36:00 -03:00 |
|
peruchi
|
7b389a79a6
|
Update zmdc.pl.in
|
2016-08-17 09:45:30 -03:00 |
|
Isaac Connor
|
cc696cbbc6
|
Merge pull request #1594 from vikaskedia/patch-2
Update README.md
|
2016-08-16 11:42:26 -04:00 |
|
Andy Bauer
|
4895942308
|
update fedora rpm readme
|
2016-08-16 09:49:45 -05:00 |
|
Andrew Bauer
|
ea34f3d69a
|
Merge pull request #1576 from ZoneMinder/show_other_zones
include polygons for the other zones.
|
2016-08-15 20:36:16 -05:00 |
|
Isaac Connor
|
19d46c2d09
|
Merge branch 'master' into storageareas
|
2016-08-15 10:45:50 -04:00 |
|
Isaac Connor
|
872adc1c62
|
Merge pull request #1578 from erelson/patch-2
Minor API doc error fixes
|
2016-08-15 10:02:57 -04:00 |
Vikas Kedia
|
31ca095445
|
Update README.md
|
2016-08-15 04:39:04 -07:00 |
|
Andrew Bauer
|
cd55c8b2fb
|
Merge pull request #1585 from ZoneMinder/copy_av_dict_parse_string_from_ffmpeg
Fixes #1584. I've just copied the relevant functions from ffmpeg sour…
|
2016-08-14 11:02:48 -05:00 |
|
Andrew Bauer
|
31cb86046c
|
Merge pull request #1592 from connortechnology/fix_analysis_frame
Fix analysis frame
|
2016-08-14 10:54:46 -05:00 |
|
Isaac Connor
|
a0bc30d3fe
|
fix the order of analyse/capture being passed
|
2016-08-12 15:40:47 -04:00 |
|
Isaac Connor
|
240336e3ec
|
silence error when Event has no StorageId set
|
2016-08-12 15:20:21 -04:00 |
|
Isaac Connor
|
9106675842
|
pass capture or analyse to getImageSrc
|
2016-08-12 15:17:13 -04:00 |
|
Isaac Connor
|
bcb7dd1ba4
|
take optional show= to specify the analyse image or the capture image
|
2016-08-12 15:16:05 -04:00 |
|
Isaac Connor
|
3dadcc8d32
|
add ability to pass show=capture or show=analyse to getImageSrc
|
2016-08-12 15:14:51 -04:00 |
|
Isaac Connor
|
bc4923b555
|
use instead of for the frame object and pass to getImageSrc which expects an array
|
2016-08-12 13:50:18 -04:00 |
|
Isaac Connor
|
3dc2170a69
|
Merge ../ZoneMinder.master
|
2016-08-12 12:48:34 -04:00 |
|
Isaac Connor
|
b36694ad8b
|
Merge branch 'master' into storageareas
|
2016-08-12 10:04:52 -04:00 |
|
Isaac Connor
|
1058796374
|
add an echo to tell us that updating is done and we are trying to start.
|
2016-08-12 10:04:35 -04:00 |
|
Isaac Connor
|
bdcc53d309
|
add an echo to tell us that updating is done and we are trying to start.
|
2016-08-12 10:04:10 -04:00 |
|
Isaac Connor
|
c1d2407ed3
|
add an echo to tell us that updating is done and we are trying to start.
|
2016-08-12 10:02:15 -04:00 |
Steve Gilvarry
|
44df4a830d
|
Merge branch 'feature-h264-videostorage' into monitor_packetqueue
|
2016-08-11 20:44:48 +10:00 |
|
Steve Gilvarry
|
7c5cc6f35e
|
Merge branch 'feature-h264-videostorage' of https://github.com/SteveGilvarry/ZoneMinder into feature-h264-videostorage
|
2016-08-11 20:35:04 +10:00 |
|
Steve Gilvarry
|
158f8c802e
|
Merge pull request #6 from connortechnology/Rotation
Rotation
|
2016-08-11 09:52:23 +10:00 |
|
Isaac Connor
|
1277f3c792
|
need arpa/inet for reverse lookups
|
2016-08-10 12:32:58 -04:00 |
|
Isaac Connor
|
6ac1a70b9c
|
Merge my Rotation/Orientation work and fixes for bad h264 streams
|
2016-08-10 12:22:04 -04:00 |
|
Isaac Connor
|
62a2ce56fb
|
Merge Rotation/Orientation work, rename id to monitor_id in cameras and also make it an unsigned int since logically that is what it is. Also some fixups for bad rtsp h264 streams.
|
2016-08-10 12:19:53 -04:00 |
|
Isaac Connor
|
be057acfed
|
Merge ../ZoneMinder.Steve into Steve
|
2016-08-10 11:04:43 -04:00 |
|
Isaac Connor
|
8ee86f5d00
|
Merge pull request #1589 from SteveGilvarry/feature-h264-videostorage
Merging Master into Feature-h264-videostorage
|
2016-08-10 11:02:03 -04:00 |
|
Steve Gilvarry
|
21c46bb519
|
Merge branch 'feature-h264-videostorage' into monitor_packetqueue
|
2016-08-11 00:52:35 +10:00 |
|
Steve Gilvarry
|
5d8159462c
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-08-11 00:51:46 +10:00 |
|
Isaac Connor
|
d6dfe3dc72
|
Merge pull request #3 from ZoneMinder/master
updates from ZoneMinder/ZoneMinder
|
2016-08-10 10:19:24 -04:00 |
|
Andy Bauer
|
f6a46e4028
|
don't build the onvif libraries in travis
|
2016-08-10 08:35:49 -05:00 |
|
Isaac Connor
|
6b70ff964b
|
fix path in cake api cleanup rules
|
2016-08-10 09:06:15 -04:00 |
|
Isaac Connor
|
3f713df826
|
bump libavutil version check as per @SteveGilvarry
|
2016-08-09 13:14:10 -04:00 |
|
Isaac Connor
|
0b92b950e2
|
Merge branch 'master' into copy_av_dict_parse_string_from_ffmpeg
|
2016-08-09 13:10:53 -04:00 |
|
Isaac Connor
|
cc06a84a0e
|
increase size of onvifprobe popup
|
2016-08-09 13:09:47 -04:00 |
|
Isaac Connor
|
f9e7d3ccd8
|
fix error messages when an empty Monitor is instantiated
|
2016-08-09 10:43:51 -04:00 |
|
Isaac Connor
|
252ac5228a
|
fix merge
|
2016-08-09 08:41:22 -04:00 |
|
Isaac Connor
|
3d65b0d2ad
|
Merge branch 'master' into storageareas
|
2016-08-08 18:09:11 -04:00 |
|
Isaac Connor
|
2451768295
|
Merge branch 'master' into storageareas
|
2016-08-08 18:08:46 -04:00 |