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

11856 Commits

Author SHA1 Message Date
Jonathan Lassoff 2074e1ccc3 use strict and remove base class methods 2018-09-03 13:51:33 +00: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 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
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
Jonathan Lassoff c605769fc9 Add Control plugin for PTZ cameras supporting the PSIA IP Media Device API 2018-08-28 15:28:52 +00:00
Isaac Connor 718bb6bba3 Remove zm from alter statement 2018-08-28 10:37:02 -04:00
Isaac Connor c271948f3d bump version to 1.31.47 2018-08-24 12:26:44 -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 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
Isaac Connor 4e30a9e71c Stats.EventId must be a bigint too 2018-08-21 12:50:33 -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 1fa78c5aa8 Fix up licensing and copyright 2018-08-17 08:14:13 -04:00
Isaac Connor 40cd27e68a when refreshing because ajax failed, reload the current view, not just index.php 2018-08-15 17:21:54 -04:00
Isaac Connor 2a4508b598 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-15 08:28:56 -04:00
Isaac Connor bb70c9f14e Cleanup Licenses. Fixes #1276 2018-08-15 08:28:44 -04:00
Isaac Connor 15a6eb7e78
Revert "Add Privacy Statement (#2176)" (#2179) 
This reverts commit 56f4d768c2.
 2018-08-13 15:33:43 -04:00
Andrew Bauer 56f4d768c2 Add Privacy Statement (#2176) 
* 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

* push privacy text to all language files
 2018-08-13 15:23:44 -04:00
Isaac Connor e6d1a9447e rename TVIP862 to Trendnet and delete TVIP672WI 2018-08-13 11:12:15 -04:00
Isaac Connor 67a3ff392b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-13 11:07:13 -04:00
Isaac Connor 70ba0ad342 Merge https://github.com/michaelbarkdoll/ZoneMinder into trendnet 2018-08-13 11:05:50 -04:00
Andrew Bauer 3dc424282b Support quoting config variables (#2175) 
* allow handling of quotes in config files

* copy paste error

* surround zm_arptool in quotes
 2018-08-11 12:56:16 -04:00
Isaac Connor 037abd4916 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-08 15:11:42 -04:00
Isaac Connor d87a41b629 Set button types so that they do things in all browsers.Fix Delete button when translated 2018-08-08 15:11:30 -04:00
Isaac Connor 23ddc83ad4
fix_2167 (#2168) 
* Populate a global  from the session on every request. Use the  object instead of using allowedMonitors in session.

* fix when  gets loaded.

* use  for auth, and add Monitor Edit checks to Zone add/delete/edit

* add back the ZM_OPT_USE_AUTH test for being logged in in AppController

* Update permissions code to use

* change quotes

* Update permission code to use

* Use  instal of session for systemPermission

* deprecate montiorPermision in session

* use  instead of session streamPermission

* move login code back into AppController. Has to be done for every request

* deprecate eventPermission, controlPermission and systemPermission in session.

* handle auth params in query string as well as post

* exit on HUP to free up memory.

* add missing global user

* system should be System
 2018-08-08 09:59:46 -04:00
Isaac Connor 6db55a24d3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-07 11:32:35 -04:00
Isaac Connor dbdb9680c0 exit on HUP to free up memory. 2018-08-07 11:32:17 -04:00
Andrew Bauer 328277536e
Update README.md 2018-08-03 10:18:11 -05:00
Isaac Connor a1c8d1300e Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-08-03 10:27:40 -04:00