Isaac Connor
|
533d021dea
|
Merge branch 'master' into storageareas
|
2019-01-30 15:17:27 -05:00 |
|
Isaac Connor
|
e53678f869
|
Can't use a normal subsitution on the Order by field. So parse the sort param instead
|
2019-01-23 12:22:00 -05:00 |
|
Isaac Connor
|
7260f823cb
|
Merge branch 'master' into storageareas
|
2019-01-21 13:52:38 -05:00 |
|
Isaac Connor
|
326ac60ae4
|
add missing braces to fix logic
|
2019-01-21 11:20:56 -05:00 |
Matt N
|
f0b33145f5
|
Log CSP violations in ZM logs in supported browsers (#2431)
|
2019-01-21 11:12:17 -05:00 |
|
Matt N
|
02fd1e79b3
|
Fix ajax/status.php orderby sql injection (#2421)
https://github.com/LoRexxar/CVE_Request/tree/master/zoneminder%20vul%20before%20v1.32.3#ajaxstatusphp-line-276-orderby-sql-injection
|
2019-01-19 09:46:08 -05:00 |
|
Isaac Connor
|
5060358870
|
Merge branch 'master' into storageareas
|
2018-12-29 09:56:53 -05:00 |
Andrew Bauer
|
3258d8e590
|
remove ZM_DIR_IMAGES (#2374)
|
2018-12-29 09:52:58 -05:00 |
|
Isaac Connor
|
e8ed1367d7
|
Merge branch 'master' into storageareas
|
2018-11-13 14:22:00 -05:00 |
|
Isaac Connor
|
abeafe9ba6
|
fix log export. minTime and maxTime were being cleared by the regexp to detect sub second time. Also use ZM_DIR_EXPORTS instead of ZM_PATH_SWAP
|
2018-11-12 15:43:03 -05:00 |
|
Isaac Connor
|
015890a509
|
Merge branch 'master' into storageareas
|
2018-10-02 15:27:12 -04:00 |
|
Isaac Connor
|
613d885930
|
!= E.id is not sufficient. Since we are enforcing chronological ordering, > and < work better than !=
|
2018-09-30 10:15:04 -04:00 |
|
Isaac Connor
|
33bd30fbbd
|
Merge branch 'master' into storageareas
|
2018-09-28 13:40:18 -04:00 |
|
Isaac Connor
|
c88dc690a6
|
Make getNearEvents smarter. When Sorting by something other than Id, include Id in the sort so that events with identical starttime for example maintain the correct chronological order.
|
2018-09-28 13:24:50 -04:00 |
|
Isaac Connor
|
9c437b0303
|
Merge branch 'add_export_to_filter' into storageareas
|
2018-09-25 14:35:19 -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
|
e4c87ce256
|
Merge branch 'master' into storageareas
|
2018-09-09 11:36:52 -04:00 |
|
Isaac Connor
|
dfdac2ed70
|
make find and find_one functions consistent across Objects
|
2018-09-07 16:31:11 -04:00 |
|
Isaac Connor
|
40292f3dad
|
Add Compression flag
|
2018-09-07 09:08:33 -04:00 |
|
Isaac Connor
|
d5cab088d6
|
Merge branch 'master' into add_export_to_filter
|
2018-09-05 10:33:10 -04:00 |
Isaac Connor
|
14b5fc3660
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-08-31 18:43:29 -04:00 |
|
Isaac Connor
|
4be2a0501c
|
Merge branch 'master' into storageareas
|
2018-08-22 17:22:54 -04:00 |
|
Isaac Connor
|
24f8d63b69
|
comment out a debug line
|
2018-08-20 11:13:38 -04:00 |
|
Isaac Connor
|
871e3807e6
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-08-17 12:57:27 -04:00 |
|
Isaac Connor
|
94401b6765
|
create ZM_PATH_SOCKS if it doesn't exist
|
2018-08-11 13:35:57 -04:00 |
|
Isaac Connor
|
e05604e4b3
|
Alter code style, spacing
|
2018-07-12 14:05:23 -04:00 |
|
Isaac Connor
|
639f916156
|
spacing
|
2018-07-09 09:59:03 -04:00 |
|
Isaac Connor
|
6bbd4f1083
|
google code style
|
2018-06-25 14:51:46 -04:00 |
|
Isaac Connor
|
798d046d81
|
Remove some debugging lines
|
2018-06-06 11:39:41 -04:00 |
|
Isaac Connor
|
25703fb2d4
|
Speed up log query response by generating the options out of the log rows instead of hitting the db again.
|
2018-05-18 09:05:25 -04:00 |
|
Isaac Connor
|
07e7ab1547
|
fix spacing
|
2018-04-20 14:21:41 -04:00 |
|
Isaac Connor
|
12d46e2377
|
change event_id in status_msg to 64bit when unpacking
|
2018-04-18 09:52:57 -04:00 |
|
Isaac Connor
|
0b0fbae1c5
|
Add output of paused image when paused
|
2018-04-12 18:43:57 -04:00 |
|
Isaac Connor
|
22f86da372
|
Have to use the .sock file instead of w.lock
|
2018-04-11 10:38:13 -04:00 |
|
Isaac Connor
|
002f22f685
|
generateAuthHash is already called earlier in index.php, so it will always be up to date. Just include it in the response.
|
2018-02-14 13:15:22 -05:00 |
|
Isaac Connor
|
2774fded57
|
add debugging and put NavBarHTML back in message
|
2018-02-14 11:57:45 -05:00 |
|
Isaac Connor
|
4df8cdc685
|
add auth_hash updating to the navbar reload.
|
2018-02-14 10:44:48 -05:00 |
|
Isaac Connor
|
a610d564d1
|
tweak timeouts
|
2018-01-31 15:51:12 -05:00 |
Isaac Connor
|
a76fcb331c
|
Remove debugging. Treat can't get semaphore as a non-error
|
2018-01-29 08:25:46 -08:00 |
|
Isaac Connor
|
b1b8b42f2b
|
Fix getting stream status updates when # of files open is > 1024.
|
2018-01-29 07:21:31 -08:00 |
|
Isaac Connor
|
2dcb0d183f
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-28 18:07:33 -08:00 |
|
Isaac Connor
|
51d5fd38aa
|
scan the board for the names of the camera inputs
|
2018-01-28 18:06:13 -08:00 |
|
Isaac Connor
|
0d734a880c
|
add hack to ensure that next and previous operate on time
|
2018-01-28 17:30:49 -05:00 |
|
Isaac Connor
|
5d4fde88d9
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla
|
2018-01-27 12:17:13 -08:00 |
|
Isaac Connor
|
bc6d8623a6
|
add a semaphore around the socket creation and retention. I think concurrent processes are messing with the sockets.
|
2018-01-27 15:03:22 -05:00 |
|
Isaac Connor
|
320f5c2083
|
Turn off error reporting in output
|
2018-01-25 09:13:44 -08:00 |
Isaac
|
1b23f7b564
|
turn off debug
|
2018-01-23 17:34:49 +01:00 |
|
Isaac Connor
|
0f3cf33565
|
Move unparse_url from add_monitors to functions to make it generally available
|
2018-01-19 08:16:52 -08:00 |
|
Isaac Connor
|
d312482a2b
|
add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE
|
2017-12-18 12:52:26 -05:00 |