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
|
7abe4c40d5
|
Merge branch 'fix_2213' into storageareas
|
2018-09-19 20:02:27 -04:00 |
|
Isaac Connor
|
95bcac4c5a
|
Implement delete_empty_subdirs that uses delete_empty_directories. The idea is to use it on the monitor dir so that the monitor dir gets left behind and not deleted when there are no events
|
2018-09-19 20:00:26 -04:00 |
|
Isaac Connor
|
5d8b915c2b
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-19 19:50:39 -04:00 |
|
Isaac Connor
|
c8b10b2e3b
|
factor out some common code when creating the event directory and add a mkdir for creating the monitor directory. Should make event writing more robust when monitor dirs do not exist for some reason.
|
2018-09-19 19:50:26 -04:00 |
Andrew Bauer
|
284d622464
|
update the way we access mapped mem in zm-alarm.pl
|
2018-09-19 12:06:09 -05:00 |
|
Isaac Connor
|
ef347f6ba3
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-19 12:05:40 -04:00 |
|
Isaac Connor
|
3a9f96e8e8
|
Skip deleting event if event is archived. And event not having a scheme is now an error
|
2018-09-19 12:03:51 -04:00 |
|
Isaac Connor
|
8a5c989cac
|
fix warning when editing users after a monitor has been deleted
|
2018-09-18 08:52:43 -04:00 |
|
Isaac Connor
|
016c6594df
|
Merge branch 'master' into storageareas
|
2018-09-18 08:45:19 -04:00 |
|
Isaac Connor
|
7f98277571
|
Merge updated Monitor.php that does caching
|
2018-09-15 09:52:08 -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
|
5dc852132e
|
Add defaults to Server, getting rid of error log when loading the default non existent storage area
|
2018-09-15 09:39:40 -04:00 |
|
Isaac Connor
|
246b50be9c
|
add caching to Server
|
2018-09-15 09:39:04 -04:00 |
|
Isaac Connor
|
02403c4c30
|
add caching to Monitor
|
2018-09-15 09:38:52 -04:00 |
|
Isaac Connor
|
27bc9d0a50
|
fix $limit should be $options['limit']
|
2018-09-15 09:38:36 -04:00 |
|
Isaac Connor
|
1db59283e3
|
use find_one when loading Monitor to take advantage of caching
|
2018-09-15 09:38:09 -04:00 |
|
Isaac Connor
|
2b66b28689
|
fix $limit should be $options['limit']
|
2018-09-15 09:37:44 -04:00 |
|
Isaac Connor
|
fa55cec12c
|
fix error when scale is auto
|
2018-09-14 16:57:28 -04:00 |
|
Isaac Connor
|
328b804465
|
spacing and quotes
|
2018-09-14 16:20:00 -04:00 |
|
Isaac Connor
|
870300ed93
|
remove debug line
|
2018-09-14 16:19:41 -04:00 |
|
Isaac Connor
|
77edb8f74b
|
Add test for auto scale and don't rescale. Use find_one when loading StorageArea so as to use caching
|
2018-09-14 16:19:29 -04:00 |
|
Isaac Connor
|
34c7ee32ee
|
Merge branch 'master' into storageareas
|
2018-09-14 15:13:57 -04:00 |
|
Isaac Connor
|
f1442eba90
|
once we have found a match for our origin, break out of loop
|
2018-09-14 14:56:26 -04:00 |
|
Isaac Connor
|
d9b1d3ec11
|
fix CORS Headers when we are coming from a non-standard port. Use a regexp instead of == so that we match regardless of port
|
2018-09-14 14:52:33 -04:00 |
|
Isaac Connor
|
b5b71edbf6
|
Make a Url function in the Monitor object to use the Server->Url + Port. Default to port used in current url. Fixes problems with using something other than port 80
|
2018-09-14 14:26:45 -04:00 |
|
Andrew Bauer
|
24ab10c07f
|
Merge pull request #2208 from pliablepixels/patch-3
fixed path for login/logout api
|
2018-09-14 10:50:59 -05:00 |
Pliable Pixels
|
0e2fdf4a1c
|
fixed path for login/logout api
|
2018-09-14 11:48:22 -04:00 |
|
Andrew Bauer
|
c086cf2291
|
Merge pull request #2207 from connortechnology/fix_2205
Fix #2205
|
2018-09-14 10:30:28 -05:00 |
|
Isaac Connor
|
f2a117c85b
|
fix undefined $event
|
2018-09-14 11:06:08 -04:00 |
|
Isaac Connor
|
4528a043c5
|
fixtypo
|
2018-09-14 11:04:52 -04:00 |
|
Isaac Connor
|
ca3fd5ddf8
|
get rid of deleteEventFiles function. People should use the object method
|
2018-09-14 10:08:35 -04:00 |
|
Isaac Connor
|
11137d271e
|
Create utility functions in event for creating linkPath and idPath. Replace the code in Generate::createEventPath with using these nice new functions
|
2018-09-14 10:06:36 -04:00 |
|
Isaac Connor
|
63bed3af10
|
replace all uses of getEventPath with object function event->Path(). Remove getEventPath
|
2018-09-14 09:23:09 -04:00 |
|
Andrew Bauer
|
7ef9cf4231
|
typo
|
2018-09-13 20:13:06 -05:00 |
|
Isaac Connor
|
60b952ab86
|
Merge branch 'master' into storageareas
|
2018-09-13 16:20:36 -04:00 |
|
Isaac Connor
|
1e00034b4c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-13 16:19:47 -04:00 |
|
Isaac Connor
|
a23e4c7676
|
merge zoneminder.postinst changes
|
2018-09-13 16:19:29 -04:00 |
|
Andrew Bauer
|
4b2d4d3871
|
fix rpm specfile changelog
|
2018-09-12 12:44:36 -05:00 |
Jonathan Lassoff
|
7bcf9d59e1
|
Use named regex capture groups.
|
2018-09-12 12:55:31 +00:00 |
|
Andrew Bauer
|
2f7c9a406a
|
bump sql to 1.32.0
|
2018-09-12 07:27:45 -05:00 |
|
Andrew Bauer
|
002bb67ccc
|
bump version to 1.32.0 release
|
2018-09-12 07:09:25 -05:00 |
|
Andrew Bauer
|
014202c41e
|
bump rpm specfile to 1.32.0
|
2018-09-12 07:08:58 -05:00 |
|
Andrew Bauer
|
b3565fb983
|
remove file that should not be there
|
2018-09-12 07:02:57 -05:00 |
|
Andrew Bauer
|
c66dd25ebb
|
implement collapsible headers (#2203)
|
2018-09-11 17:39:40 -04:00 |
|
Isaac Connor
|
eef928a742
|
fix find_all => find
|
2018-09-11 14:31:03 -04:00 |
|
Isaac Connor
|
684f48979a
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-11 14:30:19 -04:00 |
|
Isaac Connor
|
cc417cf3e7
|
reverse order of tests to be more efficient
|
2018-09-11 13:19:33 -04:00 |
|
Isaac Connor
|
b545528bb0
|
If DefaultVideo is set, use the passthrough mp4 instead of generating and mp4 from jpegs
|
2018-09-11 08:49:42 -04:00 |