Andrew Bauer
|
a029909972
|
fix path to thumb and anal images (#2367)
|
2018-12-28 10:46:13 -05:00 |
Isaac Connor
|
1c17f334d3
|
fix missing bits. Implement UrlToIndex in Monitor and fix use of Url(). Implement PathToApi as well
|
2018-11-29 14:26:30 -05:00 |
Isaac Connor
|
c5f7fb7b18
|
Merge branch 'master' into server_path_prefix
|
2018-11-22 10:04:33 -05:00 |
|
Isaac Connor
|
95a6d0666a
|
Improve behaviour and reduce extra logging when db goes away
|
2018-10-29 09:59:26 -04:00 |
|
Isaac Connor
|
c6e953c4a9
|
if Monitor is not found, return empty Monitor instead of null
|
2018-09-20 09:02:20 -04:00 |
|
Isaac Connor
|
c4108a2610
|
Fix missing quotes inc Event::Monitor
|
2018-09-20 08:59:15 -04:00 |
|
Isaac Connor
|
b0c555599c
|
Merge updated objects from sa. Implements caching of objects and fixes logged errors when using the default storage group. Fixes #2209
|
2018-09-15 09:42:59 -04:00 |
|
Isaac Connor
|
55dcb161ae
|
find should always return an array
|
2018-09-09 13:59:10 -04:00 |
|
Isaac Connor
|
dfdac2ed70
|
make find and find_one functions consistent across Objects
|
2018-09-07 16:31:11 -04:00 |
|
Isaac Connor
|
90e4c2632d
|
Use Server->Url() more,, moving the logic into Server->Url()
|
2018-07-09 12:08:50 -04:00 |
Isaac
|
af63619ce6
|
Fix Messages=>Messaged
|
2018-05-15 21:56:17 +02:00 |
|
Isaac Connor
|
b20cb5d0ae
|
Add all the other Event columns to fields
|
2018-05-11 10:36:14 -04:00 |
Isaac Connor
|
62edca6dcb
|
add fileSize to the api, and use it to add remote fileSize reporting in includes/Event
|
2018-05-08 13:33:56 -07:00 |
|
Isaac Connor
|
9127eb63dc
|
Implement file_exists function to determine either locally or through remote api calls whether the file for an event exists.
|
2018-05-07 14:07:30 -07:00 |
|
Isaac Connor
|
769d4a8693
|
DB connect can die, so put it in an eval
|
2018-05-03 09:50:54 -07:00 |
|
Isaac Connor
|
f76827a450
|
redo thumbnail code. Always link to server they event is located on
|
2018-05-03 09:36:50 -07:00 |
|
Isaac Connor
|
a4da624f4c
|
break out of loops when zm-terminate is set
|
2018-04-27 13:20:38 -07:00 |
|
Isaac Connor
|
9de3c44702
|
Add find_one and caching
|
2018-04-20 14:23:04 -04:00 |
|
Isaac Connor
|
196b8c52dc
|
Apply multiport to event viewing as well
|
2018-04-17 12:35:59 -04:00 |
|
Isaac Connor
|
bef7098cb4
|
Fix Event->Storage()
|
2018-04-15 10:26:38 -04:00 |
|
Isaac Connor
|
ce5e484f2a
|
Work harder to ensure we return a Storage object
|
2018-04-14 21:50:27 -04:00 |
|
Isaac Connor
|
03ff2fcde4
|
add caching and find_one to Storage and Groups
|
2018-04-10 13:05:37 -07:00 |
Mike Brown
|
c4a00e0657
|
changing the querySep in Event.php to allow gapless playback
|
2018-04-05 20:42:15 -05:00 |
|
Isaac Connor
|
b26707b647
|
fix resetting DiskSpace
|
2018-04-03 09:57:14 -07:00 |
|
Isaac Connor
|
9480adcc31
|
include authentication info when building the link to mp4
|
2018-02-22 13:05:53 -05:00 |
Isaac Connor
|
7d88e25ef9
|
simplify thumbnail/snapshot usage a bit
|
2018-02-19 17:25:49 -05:00 |
Isaac
|
06c9266c62
|
use snapshot.jpg more
|
2018-01-22 03:27:01 +01:00 |
|
Isaac Connor
|
915ea93348
|
source remote server when streaming event
|
2017-12-21 16:53:46 -08:00 |
|
Isaac Connor
|
2922a86d23
|
fixes to new Storage Schemes code
|
2017-12-19 11:01:03 -05:00 |
|
Isaac Connor
|
dcfae11fc7
|
fix typos
|
2017-12-18 13:16:54 -05:00 |
|
Isaac Connor
|
c93de992c2
|
add Scheme to the list of fields
|
2017-12-18 13:04:57 -05:00 |
|
Isaac Connor
|
d312482a2b
|
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
|
2017-12-18 12:52:26 -05:00 |
|
Isaac Connor
|
e2aa278d78
|
add SaveJPEGs
|
2017-11-21 23:57:44 -05:00 |
|
Isaac Connor
|
b5e59efda5
|
improve updating diskSpace entries
|
2017-10-23 17:02:04 -07:00 |
Isaac Connor
|
df8fbaccea
|
Fixes
|
2017-10-23 11:50:45 -07:00 |
|
Isaac Connor
|
ed9da696b3
|
Rough in save functionality into Event.
|
2017-10-23 10:53:58 -07:00 |
Isaac Connor
|
ba4e5572d6
|
add setting of values to anonymouse member function
|
2017-10-17 10:09:14 -07:00 |
|
Isaac Connor
|
8abb8a9259
|
add Type to Storage
|
2017-10-12 07:32:48 -07:00 |
|
Isaac Connor
|
26699953bb
|
allow setting Storage object in the Event object so as not to go back to db for it. Fix null test in DiskSpace
|
2017-10-10 12:39:14 -07:00 |
|
Isaac Connor
|
a9d3be549f
|
try caching storage
|
2017-10-10 10:39:17 -07:00 |
|
Isaac Connor
|
76d37d4c95
|
update db record when we findout the disk space of an event
|
2017-10-10 13:02:26 -04:00 |
|
Isaac Connor
|
3af795264d
|
add actual disk space as a mouseover in nav bar
|
2017-10-10 10:38:13 -04:00 |
|
Isaac Connor
|
c654d008f0
|
add monitor selector to montagereview and montage.
|
2017-10-10 09:36:56 -04:00 |
|
Isaac Connor
|
a81ff85fbb
|
add ffmpeg decoding of a .mp4 to get the frames
|
2017-08-23 15:05:44 -04:00 |
|
Isaac Connor
|
adab628af9
|
fix video speed, various other
|
2017-08-14 18:22:52 -04:00 |
|
Isaac Connor
|
792d8640c2
|
use the analyze file if exists as thumbnail
|
2017-07-28 09:54:33 -04:00 |
|
Isaac Connor
|
405078686a
|
update getStreamSrc to take a hash instead of an array of thing=thing
|
2017-06-08 14:01:22 -04:00 |
|
Isaac Connor
|
4889f3d0e8
|
rework logic in GetStreamImg a bit. If no frame is specified, then we can use snapshot...otherwise it should do the frame image!
|
2017-05-31 20:54:34 -04:00 |
|
Isaac Connor
|
29bcab9204
|
fix Debug to Logger::Debug
|
2017-05-18 13:54:06 -04:00 |
|
Isaac Connor
|
dd75c4676b
|
trivial updates (#1887)
* merge some trivial updates from storageareas
* fix the code to do zm.conf.new
|
2017-05-16 14:16:32 -04:00 |