ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,802 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

11802 Commits

Author SHA1 Message Date
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
Isaac Connor fe1e17d097 Capture can reasonably return -1 for EOF. 2018-09-05 11:16:17 -04:00
Isaac Connor af32d59aa1 add libhuman-bytes-perl and libfile-slurp-file 2018-09-05 10:18:09 -04:00
Isaac Connor 730e1fda37 We only use File::Slurp when moving files to s3fs so only require it if doing that 2018-09-05 10:14:45 -04:00
Isaac Connor c34f899d31 eliminate warning when no Storage area is set. 2018-09-04 13:57:35 -04:00
Isaac Connor c9b4f14171 fix deleting events 2018-09-04 09:57:32 -04:00
Isaac Connor 8245d193e2 Merge branch 'master' into storageareas 2018-09-04 09:48:47 -04:00
Andrew Bauer 13558b2c12
convert existing http urls in help text to markdown 2018-09-04 07:39:46 -05:00
Andy Bauer ce48343d1a embed link to privacy statment in telemetry help text 2018-09-03 13:55:11 -05:00
Isaac Connor f4c2d8adea Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-09-03 12:29:09 -04:00
Andrew Bauer e5a2581dcc optionhelp - support links markdown style (#2198) 2018-09-03 09:56:52 -04:00
Andrew Bauer 36322f9129 rpm - use _pkgdocdir instead of _docdir 2018-09-01 12:15:08 -05:00
Andrew Bauer 86f043633a typo 2018-09-01 12:04:48 -05:00
Andrew Bauer 563e673bee rpm - rename README.xxx to README for all builds 2018-09-01 11:53:56 -05:00
Isaac Connor 14b5fc3660 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-08-31 18:43:29 -04:00
Isaac Connor 2858564155 Merge branch 'master' into storageareas 2018-08-31 16:06:13 -04:00
Isaac Connor 9ec415b30a Just reload the event view instead of dynamically updating the stream. Fixes #2196 2018-08-31 15:56:21 -04:00
Isaac Connor 798aab84f3 whitespace changes 2018-08-31 11:58:33 -04:00
Isaac Connor 623d31edae Don't do csrf for view=image 2018-08-31 11:58:17 -04:00
Isaac Connor 7ee80e7cca Debug lines should be debug, not warning 2018-08-31 11:58:03 -04:00
Isaac Connor 57d5e28870 clear output buffer before sending image. Adjust filename for saveAs when doing a scaled image. whitespace corrections. More Debug output 2018-08-31 11:57:47 -04:00
Isaac Connor f3a7a61849 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-31 10:53:26 -04:00
Isaac Connor 0823b28712 whitespace changes. Make Privacy test an else so that PRIVACY checks don't happen if not logged in 2018-08-31 10:37:11 -04:00
Isaac Connor 4b30ea7877 cleanup, whitespace 2018-08-31 10:35:23 -04:00
Andrew Bauer 029c6401af add libjson-maybexs-perl as a debian package dependency 2018-08-31 09:34:54 -05:00
Isaac Connor 799b34eee8 handle xhr errors like when auth is no longer valid. Do a page refresh when this happens 2018-08-31 10:34:54 -04:00
Andrew Bauer 18c88be550
bump rpm specfile to 1.31.47 2018-08-31 07:59:51 -05:00
Isaac Connor b1fe80a0bd Add JSON/MaybeXS to dependencies, replacing JSON/Any 2018-08-30 18:30:33 -04:00
Isaac Connor df3da6dd93 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-08-30 14:53:39 -04:00
Isaac Connor 0eaa539dc6 ZM_SWAP_PATH may not exist, so always try to create it 2018-08-30 14:53:27 -04:00
Isaac Connor 4e32089a48 Merge branch 'master' into storageareas 2018-08-30 14:51:27 -04:00
Andrew Bauer 8f0fb0843a Add Privacy Statement (#2194) 
* initial implementation of privacy popup

* split the privacy text and run it through translate

* change style of toggle button, validate the form

* fix copy/paste error

* fix typos

* display privacy view inline rather than popup

* display privacy inline if show_privacy flag set

* redirect to console after selection is made

* typo

* css formatting

* update privacy verbiage

* create and load default.php

* fix typos

* fix erroneous copy/paste
 2018-08-30 13:25:02 -04:00
Isaac Connor b7c86ef3d4 remove escapes that mess up the quoting 2018-08-30 12:26:18 -04:00
Isaac Connor d3e089e3ce remove an escape that messed up the quoting 2018-08-30 11:18:48 -04:00
Isaac Connor 718bb6bba3 Remove zm from alter statement 2018-08-28 10:37:02 -04:00
Isaac Connor f2d4739838 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-08-24 17:11:39 -04:00
Isaac Connor 24f0ed7e03 Merge branch 'master' into storageareas 2018-08-24 12:26:59 -04:00
Isaac Connor c271948f3d bump version to 1.31.47 2018-08-24 12:26:44 -04:00
Isaac Connor 1ff2469099 Merge branch 'master' into storageareas 2018-08-24 10:49:57 -04:00
Isaac Connor d64dc4f288 Frames EventId somehow never got an update even though zm_create.sql did.So add an update to convert EventId to a bigint. 2018-08-24 10:49:30 -04:00
Isaac Connor 4be2a0501c Merge branch 'master' into storageareas 2018-08-22 17:22:54 -04:00
Isaac Connor 21d193294f Log errors shouldn't be fatal 2018-08-22 17:22:40 -04:00
Isaac Connor d296d59625 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-22 16:34:29 -04:00
Isaac Connor 627d47980a prevent killall zombies by ignoring SIGCHLD at startup 2018-08-22 16:33:11 -04:00
vajonam d97eea886a fix scoring algorithim, to use max_alarm_size when specified instead of the size of the zone. (#2186) 2018-08-22 12:58:26 -04:00
Isaac Connor 459a88a5e7 Merge branch 'master' into ip_webcam_preset 2018-08-22 11:23:56 -04:00
Isaac Connor 90eda0b88b spacing, remove extra parenthesis 2018-08-22 11:14:00 -04:00
Isaac Connor 8742388acd Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-22 09:31:51 -04:00