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 |
|
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 |
|
Isaac Connor
|
c70fb2f195
|
When signal loss occurs, trigger an event close so that the event stops because we are no longer writing to the mp4
|
2018-09-10 17:11:16 -04:00 |
|
Isaac Connor
|
bf1fbd169c
|
return uninformative debug statement
|
2018-09-10 15:12:19 -04:00 |
|
Isaac Connor
|
8608fc97be
|
fix trms=>terms
|
2018-09-10 15:11:57 -04:00 |
|
Isaac Connor
|
0ee261fae3
|
get rid of code that hid the close/back button on events if there was no history.
|
2018-09-10 15:11:41 -04:00 |
|
Isaac Connor
|
042d4c3099
|
Default to auditing all Storage Areas. Add a Server flag to audit only areas on a specific server.
|
2018-09-09 18:32:00 -04:00 |
|
Isaac Connor
|
978e332e3a
|
Merge branch 'master' into storageareas
|
2018-09-09 16:36:31 -04:00 |
|
Isaac Connor
|
534aebb21f
|
When loading previous and subsequent log lines, merge the fields in the filters instead of replacing
|
2018-09-09 16:36:09 -04:00 |
|
Isaac Connor
|
5eec7e00c5
|
Merge branch 'master' into storageareas
|
2018-09-09 14:09:52 -04:00 |
|
Isaac Connor
|
a296b2b777
|
fix crash when savind audio on ffmpeg 2.8
|
2018-09-09 14:01:03 -04:00 |
|
Isaac Connor
|
55dcb161ae
|
find should always return an array
|
2018-09-09 13:59:10 -04:00 |
|
Isaac Connor
|
b4f80fbe11
|
Always return an array from find
|
2018-09-09 13:56:29 -04:00 |
|
Isaac Connor
|
882e47c9ab
|
Fix deleting empty directories
|
2018-09-09 13:28:24 -04:00 |
|
Isaac Connor
|
9e8a876101
|
Fix finding Storage by ServerId
|
2018-09-09 13:28:11 -04:00 |
|
Isaac Connor
|
b8f6617db3
|
fix another instance of find_all
|
2018-09-09 12:15:06 -04:00 |
|
Isaac Connor
|
e4c87ce256
|
Merge branch 'master' into storageareas
|
2018-09-09 11:36:52 -04:00 |
|
Isaac Connor
|
1a2232734c
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-09-09 11:35:12 -04:00 |
|
Isaac Connor
|
d945e2ba54
|
Fix context allocation on ffmpeg 2.8. Fixes #41 on connorTechnology fork.
|
2018-09-09 11:34:12 -04:00 |
Vitaly Saversky
|
b778fd782c
|
Misspelling - non-recordable (#2200)
|
2018-09-09 09:39:30 -04:00 |
|
Isaac Connor
|
dfdac2ed70
|
make find and find_one functions consistent across Objects
|
2018-09-07 16:31:11 -04:00 |
|
Isaac Connor
|
fa690826a3
|
clean up zmstats, add db reconnect
|
2018-09-07 16:30:47 -04:00 |
|
Isaac Connor
|
b7aa11f109
|
Fix infinite loop reconnecting to db in Logging
|
2018-09-07 16:30:24 -04:00 |
|
Isaac Connor
|
def72b8e66
|
tidy up license
|
2018-09-07 16:29:59 -04:00 |
|
Isaac Connor
|
426aeea95b
|
add db reconnects to zmwatch.
|
2018-09-07 16:29:23 -04:00 |
|
Isaac Connor
|
4b69f520d5
|
Merge branch 'master' into storageareas
|
2018-09-05 12:08:23 -04:00 |