Isaac Connor
|
b9bba6bde5
|
fix to
|
2016-07-25 15:32:57 -04:00 |
Isaac Connor
|
8db20a4543
|
change test for prevDTS >= dts to just prevDTS > dts
|
2016-07-25 13:23:44 -04:00 |
|
Isaac Connor
|
b9a15d1465
|
fix missed to conversion
|
2016-07-23 13:37:00 -04:00 |
|
Isaac Connor
|
4c1c95e3a5
|
only include the state if canEdit(system) otherwise it gives an auth error
|
2016-07-22 16:04:42 -04:00 |
|
Isaac Connor
|
32f9b2755e
|
add more height to the logout popup
|
2016-07-22 16:04:18 -04:00 |
|
Isaac Connor
|
8194876454
|
always put popup links in a, even if it is disabled
|
2016-07-22 16:03:57 -04:00 |
|
Isaac Connor
|
6d1f85bcd6
|
fix spacing and code style, and when logging in, change view to console
|
2016-07-22 16:03:39 -04:00 |
|
Isaac Connor
|
9262d9d14e
|
remove debug messages on css changing
|
2016-07-22 16:02:55 -04:00 |
|
Isaac Connor
|
3504c1d8f5
|
Add Id to the title for each monitor
|
2016-07-21 15:02:01 -04:00 |
|
Isaac Connor
|
440f8fafdd
|
implement object based versions of getImageSrc and creatListThumbnail
|
2016-07-20 15:21:23 -04:00 |
|
Isaac Connor
|
8c8461a88e
|
Update to use Event object and object based createListThumbnail function
|
2016-07-20 15:20:51 -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
|
a089f11014
|
add more NULL columns
|
2016-07-19 17:17:11 -04:00 |
|
Isaac Connor
|
4caa20821a
|
fix
|
2016-07-14 11:57:06 -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
|
be1083e007
|
add more fields that can be NULL
|
2016-07-14 10:28:00 -04:00 |
|
Isaac Connor
|
14d8496972
|
add NULL test for RTSPDesribe
|
2016-07-14 10:27:24 -04:00 |
|
Isaac Connor
|
b6c02b563b
|
turn off host validation
|
2016-07-14 10:22:09 -04:00 |
|
Isaac Connor
|
b7096b742d
|
implement some checks for valid values when opening the output file
|
2016-07-13 15:29:29 -04:00 |
|
Isaac Connor
|
df6aaf5dec
|
bump to 1.30.4
|
2016-07-13 12:45:35 -04:00 |
|
Isaac Connor
|
f68527674a
|
merge Steve's tree, which allegedly fixes the header problems
|
2016-07-13 12:38:12 -04:00 |
|
Isaac Connor
|
8eac8a1e1a
|
Merge branch 'master' into storageareas
|
2016-07-13 09:50:30 -04:00 |
Steve Gilvarry
|
b05eabfe1d
|
Forgot that I was trying to solve case of stream is true and record_audio
is false.
|
2016-07-13 08:31:10 +10:00 |
Andrew Bauer
|
59cc952cef
|
Merge pull request #1557 from ZoneMinder/fix_zmvideo
restore the behaviour where the generated file names are printed to stdout
|
2016-07-12 15:06:57 -05:00 |
|
Isaac Connor
|
85c0377280
|
When generating video, zmvideo.pl now returns the file path to the video file so don't append eventPath to it
|
2016-07-12 14:21:54 -04:00 |
|
Isaac Connor
|
1e2ec7028e
|
better debugging. add back deleting of zmswap files. detaint them so that they can be deleted. Use Objects to fix up deleting events
|
2016-07-12 14:16:20 -04:00 |
|
Isaac Connor
|
91ef963738
|
add case for no rotation to get rid of log message
|
2016-07-12 12:06:12 -04:00 |
|
Isaac Connor
|
26369268bb
|
merge Steve's updates, work on zmaudit
|
2016-07-12 11:27:25 -04:00 |
|
Isaac Connor
|
a30610fbda
|
Merge branch 'master' into storageareas
|
2016-07-12 10:31:10 -04:00 |
|
Isaac Connor
|
7ff7684da6
|
add back deban install docs
|
2016-07-12 10:31:05 -04:00 |
|
Isaac Connor
|
410e154b7f
|
code style
|
2016-07-12 10:29:40 -04:00 |
|
Steve Gilvarry
|
f1b9e1205a
|
Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio
|
2016-07-12 23:13:02 +10:00 |
Isaac Connor
|
6129732e61
|
restore the behaviour where the generated file names are printed to stdout.
|
2016-07-11 08:01:43 -04:00 |
|
Steve Gilvarry
|
5d2ece0063
|
Why are these failing
|
2016-07-10 11:57:08 +10:00 |
|
Steve Gilvarry
|
25f7a8cadf
|
Restore lost fixes for deprecation
|
2016-07-09 22:31:01 +10:00 |
|
Steve Gilvarry
|
142784746c
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-07-07 19:33:04 +10:00 |
|
Andrew Bauer
|
477c02382b
|
Update CMakeLists.txt
Minor change for fedora rpmbuild
|
2016-07-06 19:06:28 -05:00 |
|
Steve Gilvarry
|
4873683f01
|
Merge pull request #1548 from knnniggett/libjpegturbo
fix jpeg buffer too small
|
2016-07-07 00:13:54 +10:00 |
|
Andrew Bauer
|
257ce2b9a9
|
Merge pull request #1546 from SteveGilvarry/DocsUpdate
Updates to Ubuntu and Debian install guides
|
2016-07-05 09:30:45 -05:00 |
|
Steve Gilvarry
|
5811ba7eda
|
Swap to apt-get for debian
|
2016-07-05 23:10:03 +10:00 |
|
Steve Gilvarry
|
3a40f39d83
|
Fix 14.04 php.ini location and some more formatting issues
|
2016-07-05 07:52:37 +10:00 |
|
Steve Gilvarry
|
219289ee20
|
Consistency changes
|
2016-07-05 07:15:01 +10:00 |
Andrew Bauer
|
75a98601ef
|
fix jpeg buffer too small
|
2016-07-03 14:59:05 -05:00 |
|
Andy Bauer
|
980d3f6e7f
|
rpm housecleaning, change the way jscalendar is installed
|
2016-07-03 11:34:35 -05:00 |
|
Steve Gilvarry
|
b2d1d688cc
|
Updates to Ubuntu and Debian install guides
|
2016-07-03 20:21:13 +10:00 |
|
Steve Gilvarry
|
3eccdcd3e2
|
Merge pull request #1524 from ZoneMinder/add_api_auth
if user=&pass= are in request, use them for auth in api
|
2016-06-29 21:47:44 +10:00 |
|
Steve Gilvarry
|
f3779d543c
|
Merge pull request #1521 from ZoneMinder/fix_zone_edit
update area when points move
|
2016-06-29 21:46:28 +10:00 |
|
Steve Gilvarry
|
bdd0790106
|
Merge pull request #1522 from ZoneMinder/video_session
Move the session start down to where it is actually needed so that we…
|
2016-06-29 21:45:12 +10:00 |