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
Isaac Connor
b51ff8492b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-03 10:02:53 -04:00
Isaac Connor
b72d520e02
implement the ability to pass a disabled option to htmlSelect. Use it to disable the h264 passthrough option for non-ffmpeg monitors. Instead of disappearing it.
2018-08-03 10:02:42 -04:00
Isaac Connor
a0e67da51d
Improve loging around writing out analysis frames
2018-08-02 15:40:33 -04:00
Andrew Bauer
c8ed12f573
Update ISSUE_TEMPLATE.md
2018-08-02 09:49:40 -05:00
Andrew Bauer
6ad732e419
retrieve greip data rather than the ip ( #2173 )
2018-07-31 14:01:01 -04:00
Andrew Bauer
63153f05be
bump version in rpm specfile
2018-07-31 12:25:00 -05:00
Isaac Connor
11cedb4335
repeat the update that adds Refresh to Monitors. Bump version.
2018-07-31 10:27:34 -04:00
Isaac Connor
ee97dc39dc
Add Refresh column to Monitors table. Explicitly put it after ZoneCount in the update.sql
2018-07-31 10:22:13 -04:00
Isaac Connor
886391a547
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-07-31 10:16:05 -04:00
Isaac Connor
363e1dda97
Add some more Monitor defaults, mainly Refresh which gets called in watch.js.php
2018-07-31 10:15:26 -04:00
Roman Dissertori
48b91c5544
Bugfix in Control and added new Camera ( #2171 )
...
* fixed control typos
missing word "s" for "Controls" Table for database queries
* added Dericam P2 camera Control
* fixed missing CanReset column
* Update DericamP2.pm
* added some more missing controls
CanSleep, CanWake
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update DericamP2.pm
* Update zm_create.sql.in
2018-07-28 09:26:02 -04:00
Isaac Connor
2ff47e04da
the updated video-js.css puts the fonts into a font dir.
2018-07-25 17:04:42 -04:00
Isaac Connor
00bdfdcb16
increase height of function popup so that dropdown options fit in it
2018-07-25 09:39:24 -04:00
Isaac Connor
6ab1c3ced8
proper case table header
2018-07-25 09:39:08 -04:00
Isaac Connor
dc57a3c91c
fix spacing/quotes/google code style
2018-07-24 16:41:09 -04:00
Isaac Connor
7e63b322c1
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-07-22 09:58:15 -04:00
Andrew Bauer
f07b1105d3
Merge pull request #2164 from pliablepixels/fixGetCredentials
...
fixed getCredentials not working if called directly
2018-07-17 13:24:01 -05:00
Pliable Pixels
997aa6aa55
fixed getCredentials not working if called directly
2018-07-17 13:57:20 -04:00
Pliable Pixels
d45ca8880a
documentation for new login/logout APIs ( #2163 )
2018-07-17 13:24:47 -04:00