4d044a1f14
Fix logging line in generate video function
2020-02-25 18:11:07 -05:00
f719514998
remove debug
2020-02-25 13:39:33 -05:00
4dda37a6ee
remove extra }
2020-02-25 12:13:12 -05:00
d68d115581
Handle scale==0 to do width=100%.
2020-02-25 11:12:49 -05:00
df5bf788d9
Filtering by Alarmed Zone now only supports a single value using EXISTS as the operator. We now also support CURDATE() and NOW() as values for Date/StartDate/EndDate
2020-01-24 11:09:27 -05:00
9d41334e8f
Merge branch 'master' into add_alarmed_zone_to_filters
2020-01-22 13:45:37 -05:00
a3754709e4
allow filters to not have terms specified. We can't pass an empty array in a url, so we will just have to handle it.
2020-01-18 16:09:33 -05:00
714d304528
Change WebColour to a colour selector input and add a random colour icon. Select a random colour on new Monitor creation
2019-12-31 19:10:29 -05:00
9e43e06a55
Add empty array value for terms when there isn't any to get rid of warning when loading all events
2019-12-26 11:22:42 -05:00
e39a95d761
Add AlarmedZoned to filters, work on fixing filter behaviour in js. Enable viewing filter results in montagereview
2019-12-18 19:06:10 -05:00
4d9d4ba957
Do not allow deletion of archived events.
2019-12-15 10:35:43 -05:00
df9f6103e4
fix syntax error
2019-12-04 09:00:20 -05:00
78912584e1
re-arrange code to hopefully get rid of syntax error reported by some people
2019-12-04 07:10:33 -05:00
576dd23907
test for existence of filter in query
2019-12-02 12:30:15 -05:00
cab1056328
improve debugging in recursive_array_diff
2019-11-29 14:49:10 -05:00
1c54f22627
Introduce CSP_REPORT_URI to config and use it when setting up CSP headers as to where to report unsafe inline js to.
2019-11-08 15:18:08 -05:00
014ce0afe8
improve error message regarding timezone differences
2019-11-05 12:40:11 -05:00
988b2183c3
use new ViewWIdth and ViewHeight functions to generate video stream.
2019-10-29 17:42:48 -04:00
3244c8ab5b
spacing, quotes, remove debug
2019-10-21 13:18:09 -04:00
13b02284fe
Merge branch 'master' into timezone_as_config
2019-10-18 13:58:22 -04:00
4b71bc75ea
Change language to Contains / Not Contains and update perl filter.
2019-10-16 00:35:49 +01:00
d02aee64e4
Add setting of timezone to Options/Config instead of php.ini
2019-10-02 09:07:18 -04:00
7479d3f1f1
Add LIKE and NOT LIKE to filter options
...
This is useful for filtering notes.
EG filtering detected objects from zmeventnofification;
WHERE notes LIKE %detect%
WHERE notes NOT LIKE %car%
2019-09-28 13:03:16 +01:00
555f3e9c0d
Fix missing semi colon in Content-Security-Policy-Report-Only
2019-09-26 13:52:27 -04:00
4deea4c6ab
code doc
2019-09-25 10:35:57 -04:00
fe893a4a01
Add report-uri to out Content-Security-Policy-Report-Only header
2019-09-25 10:16:02 -04:00
1539e34204
spacing
2019-09-19 14:57:28 -04:00
1407d849e8
deprecate getStreamSrc in functions.php.
2019-09-18 11:10:25 -04:00
6b9e8bec69
Add logging of delete events
2019-08-29 11:26:32 -04:00
231c9c3902
move executeFilter to Filter->execute. If no changes have been made, don't make a tempfilter.
2019-08-26 18:48:34 -04:00
7ef26275bc
use isset to get rid of warnings when eid is not in REQUEST
2019-08-20 10:28:19 -04:00
f09941ed48
timezone errors shouldn't be fatal
2019-08-15 15:16:02 -04:00
702cb65d2a
Merge branch 'storageareas'
2019-08-08 13:38:36 -04:00
df285006d2
change sortHeader to include eid if it is in the request
2019-08-08 13:34:10 -04:00
5b0509e000
When invalid operator terms, use print_r on the term instead of just the operator
2019-08-08 09:26:00 -04:00
45afc2a534
introduce array_recursive_diff which we use to compare two arrays in Object::changes
2019-07-24 11:24:37 -04:00
fe71a9abaa
php_errormsg is deprecated
2019-07-19 16:32:40 -04:00
1336c03f97
WIP: Add pagination to frames.php in classic ( #2618 )
...
* add pagination to the frames.php results
* remove commented code, fix view all paging
* removing debugging logging statements
* default frames paging to on
2019-06-16 12:02:00 -04:00
b0869a0b13
spaces and quotes
2019-05-31 10:34:53 -04:00
db9ba7eeab
Add StartDateTime and EndDateTime as Sort options. Fixes #2614
2019-05-24 10:02:15 -04:00
8f28ba0be3
beter debug and less often when no terms in parseFilter
2019-03-22 17:28:12 -04:00
7f7acc18ee
spacing and code doc
2019-03-21 14:14:30 -04:00
6efeab5f8d
improve readability of parseFilter
2019-03-20 14:26:48 -04:00
778707c8df
Merge branch 'master' into storageareas
2019-03-04 14:33:28 -05:00
96e29c0299
fix up remaining issues with cycle updates
2019-03-04 13:35:40 -05:00
5da51d51bc
Merge branch 'master' into storageareas
2019-02-26 10:55:51 -05:00
2187dea2aa
add namespace to Warnings
2019-02-25 15:11:08 -05:00
fd310c0f0a
Merge branch 'master' into storageareas
2019-02-22 11:33:47 -05:00
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
5029d7214a
Merge branch 'master' into storageareas
2019-02-18 17:00:45 -05:00
Isaac Connor
Isaac Connor
externo6
Tom Hodder
Isaac Connor