df348c3513
lets go with reporting actual errors
2019-04-10 11:48:17 -04:00
f7dfe2982b
Fix deleting single events
2019-04-10 11:46:12 -04:00
c3324ada18
Put back mkdir ZM_PATH_SOCKS
2019-03-20 14:26:03 -04:00
84a200395e
spacing and turn off errors because ajax should only return json
2019-03-20 14:25:34 -04:00
6b6e787e4e
fix ajax stream code
2019-03-19 12:05:45 -04:00
418276ff1c
cleanup/debug
2019-03-19 12:02:42 -04:00
e9a6eee2bb
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-03-01 17:47:50 -05:00
190142b24c
Merge branch 'master' into storageareas
2019-03-01 17:47:07 -05:00
520bd4e7a7
Add ZM namespace to Logger
2019-03-01 14:42:05 -05:00
95567e07a4
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-26 11:43:07 -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
3d6efe2253
Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas
2019-02-13 11:10:07 -05:00
555cb4780d
Merge branch 'master' into storageareas
2019-02-10 12:37:45 -05:00
c8e41bfee7
log.php: Ensure 'line' is an integer. Helps with #2466
2019-02-10 00:10:39 -08:00
02f09aad7f
view=export: Remove inline event handlers and fix arbitrary URL/XSS usage. Fixes #2443
2019-02-09 02:01:26 -08:00
0b38e72f88
view=download: Remove inline event handlers and fix arbitrary URL/XSS usage. Fixes #2441
2019-02-09 01:16:32 -08:00
533d021dea
Merge branch 'master' into storageareas
2019-01-30 15:17:27 -05:00
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
7026ebafac
Make ajax/stream wait longer for zms. On pi can take up to 3 seconds. Also for php < 5.6, we need to fake 64bit unpack support
2019-01-22 16:45:38 -05:00
7260f823cb
Merge branch 'master' into storageareas
2019-01-21 13:52:38 -05:00
326ac60ae4
add missing braces to fix logic
2019-01-21 11:20:56 -05:00
f0b33145f5
Log CSP violations in ZM logs in supported browsers ( #2431 )
2019-01-21 11:12:17 -05:00
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
5060358870
Merge branch 'master' into storageareas
2018-12-29 09:56:53 -05:00
3258d8e590
remove ZM_DIR_IMAGES ( #2374 )
2018-12-29 09:52:58 -05:00
e8ed1367d7
Merge branch 'master' into storageareas
2018-11-13 14:22:00 -05:00
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
015890a509
Merge branch 'master' into storageareas
2018-10-02 15:27:12 -04:00
613d885930
!= E.id is not sufficient. Since we are enforcing chronological ordering, > and < work better than !=
2018-09-30 10:15:04 -04:00
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
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
9c437b0303
Merge branch 'add_export_to_filter' into storageareas
2018-09-25 14:35:19 -04:00
978e332e3a
Merge branch 'master' into storageareas
2018-09-09 16:36:31 -04:00
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
e4c87ce256
Merge branch 'master' into storageareas
2018-09-09 11:36:52 -04:00
dfdac2ed70
make find and find_one functions consistent across Objects
2018-09-07 16:31:11 -04:00
40292f3dad
Add Compression flag
2018-09-07 09:08:33 -04:00
d5cab088d6
Merge branch 'master' into add_export_to_filter
2018-09-05 10:33:10 -04:00
14b5fc3660
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-31 18:43:29 -04:00
4be2a0501c
Merge branch 'master' into storageareas
2018-08-22 17:22:54 -04:00
24f8d63b69
comment out a debug line
2018-08-20 11:13:38 -04:00
871e3807e6
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-17 12:57:27 -04:00
94401b6765
create ZM_PATH_SOCKS if it doesn't exist
2018-08-11 13:35:57 -04:00
e05604e4b3
Alter code style, spacing
2018-07-12 14:05:23 -04:00
639f916156
spacing
2018-07-09 09:59:03 -04:00
6bbd4f1083
google code style
2018-06-25 14:51:46 -04:00
798d046d81
Remove some debugging lines
2018-06-06 11:39:41 -04:00
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
07e7ab1547
fix spacing
2018-04-20 14:21:41 -04:00
Isaac Connor
Isaac Connor
Matthew Noorenberghe
Andrew Bauer