Isaac Connor
|
8194876454
|
always put popup links in a, even if it is disabled
|
2016-07-22 16:03:57 -04:00 |
|
Isaac Connor
|
b1d0223c30
|
implement human_filesize
|
2016-07-20 15:20:21 -04:00 |
|
Isaac Connor
|
bce7369984
|
Merge branch 'disk_space_in_events' into storageareas
|
2016-07-19 17:36:15 -04:00 |
|
Isaac Connor
|
cd43d1fa7a
|
Rough in Event disk space reporting
|
2016-07-19 17:34:01 -04:00 |
|
Isaac Connor
|
eb0ddc4e32
|
update and use Monitor object to generate the stream html. Also introduce a mode parameter to getStreamHTML to specify stills
|
2016-07-14 11:55:27 -04:00 |
|
Isaac Connor
|
c1f30480e3
|
fix merge
|
2016-06-23 12:49:27 -04:00 |
|
Isaac Connor
|
e29a0ebe71
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-06-21 13:48:32 -04:00 |
|
Isaac Connor
|
31a5252afa
|
apply btn and btn-primary styles to remaining buttons on console
|
2016-06-21 09:22:32 -04:00 |
|
Isaac Connor
|
1d1cedce95
|
use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode
|
2016-06-20 12:40:33 -04:00 |
|
Isaac Connor
|
26bba58c56
|
Merge branch 'master' into feature-h264-videostorage
|
2016-06-17 11:09:47 -04:00 |
Isaac Connor
|
acba5bccf1
|
Always include the monitor Id in the tag id for the videostream
|
2016-06-14 12:38:37 -04:00 |
|
Isaac Connor
|
94174a1fe2
|
use user= and pass= instead of auth hash
|
2016-06-07 15:47:59 -04:00 |
|
Isaac Connor
|
086d435712
|
send zmcCommand to api on server
|
2016-06-07 14:39:59 -04:00 |
|
Isaac Connor
|
8fabeb78d3
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-05-24 15:55:49 -04:00 |
|
Isaac Connor
|
a8e407172a
|
split out versus get functionality in includes/functions. Fix positioning of svg over image stream
|
2016-05-24 15:50:22 -04:00 |
|
Isaac Connor
|
89f58daf89
|
Merge branch 'master' into fix_zone_edit
|
2016-05-24 15:30:56 -04:00 |
|
Isaac Connor
|
ae1eb94f27
|
fix getStreamHTML when using helper
|
2016-05-24 15:10:37 -04:00 |
|
Isaac Connor
|
e62ea454ba
|
Merge branch 'master' into storageareas
|
2016-05-17 10:48:52 -04:00 |
|
Isaac Connor
|
1530096560
|
whitespace/google code style
|
2016-05-12 10:17:41 -04:00 |
|
Isaac Connor
|
35783f7dc0
|
Merge branch 'mysql_fixes' into storageareas
|
2016-05-09 19:27:42 -04:00 |
|
Isaac Connor
|
7f9c70d521
|
when value to be stored is undefined or '', then set the field=NULL
|
2016-05-09 13:39:40 -04:00 |
|
Isaac Connor
|
fe63e4af80
|
remove extra semi colon
|
2016-05-02 13:42:42 -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
|
0044161b9c
|
Merge branch 'fix_zone_edit' into storageareas
|
2016-04-29 10:46:37 -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 |
|
Isaac Connor
|
af66105c37
|
Merge branch 'master' into storageareas
|
2016-04-29 08:28:53 -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 |
|
Isaac Connor
|
d847d66e99
|
handle disk_free_space error
|
2016-04-26 14:40:40 -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
|
d493ca69a9
|
Merge branch 'master' into icon_video
|
2016-04-11 09:31:51 -04:00 |
|
Isaac Connor
|
78c6e14e0c
|
Merge branch 'master' into storageareas
|
2016-04-09 14:52:28 -04:00 |
|
Isaac Connor
|
feb7b36f11
|
use a local variable to prevent modifying the arguments
|
2016-04-09 11:23:52 -04:00 |
|
Isaac Connor
|
e90024c0d0
|
Better Error logging on disk_total_space failure
|
2016-04-09 09:27:12 -04:00 |
|
Isaac Connor
|
6bb95beb9a
|
Merge branch 'svg_zones' into storageareas
|
2016-04-08 13:20:01 -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
|
7491aa4381
|
fix spelling mistake
|
2016-04-06 10:55:11 -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 |
|
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
|
bc9760ce79
|
Merge branch 'master' into storageareas
|
2016-04-04 16:13:17 -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
|
197ae67313
|
Merge branch 'always_show_ptz' into storageareas
|
2016-04-04 11:47:29 -04:00 |
|
Isaac Connor
|
c8fa0a9b4f
|
Merge branch 'master' into feature-h264-videostorage
|
2016-04-04 10:14:15 -04:00 |
|
Isaac Connor
|
8a2605578a
|
fix type in htmlSelect
|
2016-04-01 15:43:40 -04:00 |
|
Isaac Connor
|
ca96481036
|
fix thumbnail generation from video file
|
2016-04-01 13:02:31 -04:00 |