24845e0457
Merge branch 'master' into storageareas
2019-02-14 15:40:52 -05:00
62bf7d54f1
close sth's on Fatal to prevent error message
2019-02-14 15:40:42 -05:00
a3374aa26c
Merge branch 'reload_zmfilter_on_filter_save' into storageareas
2019-02-11 13:26:53 -05:00
87413d447d
Set CSRF on as the default for new installs. Fixes #2507 ( #2508 )
...
* Set CSRF on as the default for new installs. Not sure we can impact config on existing installations.
* Fix the spelling mistake that I noticed after editing this.
2019-02-10 13:08:58 -05:00
555cb4780d
Merge branch 'master' into storageareas
2019-02-10 12:37:45 -05:00
e2fc0ea25d
Increase navbar refresh times. 5 seconds is way too fast
2019-02-08 10:22:42 -05:00
d121ecab75
Merge branch 'improve_session' into storageareas
2019-02-05 15:48:42 -05:00
5b288d3b67
split description into description and help text for COOKIE_LIFETIME
2019-02-05 11:39:50 -05:00
a176c9bbd2
improve debug line when there is a problem updating config entry
2019-02-05 11:39:21 -05:00
4e10e6f0ae
Merge branch 'improve_session' into storageareas
2019-01-30 15:26:37 -05:00
1e56e750cf
Introduce ZM_COOKIE_LIFETIME which sets the life of the SESSION cookie, instead of using what is in php.ini
2019-01-30 11:04:38 -05:00
cc8de69eba
Merge branch 'master' into storageareas
2019-01-22 11:44:42 -05:00
e60e3666d5
Fix comment
2019-01-22 10:53:53 -05:00
0619a4a161
Validate cnj, obr, and cbr arguments in parseFilter ( #2434 )
2019-01-22 08:03:25 -05:00
b8d065275b
Merge branch 'master' into storageareas
2019-01-04 15:22:18 -05:00
571daec8fc
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
...
refresh with master
2019-01-03 15:02:57 -05:00
e21b8dc1f9
changed to ZM db functions
2019-01-02 16:01:33 -05:00
51d3e6b2cd
changed to ZM db functions
2019-01-02 14:09:35 -05:00
bd2b761bcd
change configdata.pm.in defaults
2018-12-31 09:54:48 -06:00
f25e176b88
added create table if not exist
2018-12-29 20:57:46 -05:00
2cac25d353
removed unused preset code
2018-12-29 19:35:16 -05:00
bcbe9075f9
fixed preset delete and set
2018-12-28 21:11:52 -05:00
826201a3f9
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
2018-12-28 20:32:04 -05:00
1a1231fdaa
Merge branch 'master' into storageareas
2018-12-28 10:47:27 -05:00
265a73ab29
Spelling mistake fix
...
Changed his to this
2018-12-27 22:26:07 -05:00
f815aaa5f5
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
2018-12-21 19:46:45 -05:00
64bdf40e86
Logging and whitespace changes. No logical changes
2018-12-20 13:50:55 -05:00
eccfdb8a6a
Logging and whitespace changes. No logical changes
2018-12-20 13:50:07 -05:00
180a4b07b1
foscam r2c ptz
2018-12-14 19:13:41 -05:00
51b4c27b27
foscam r2c ptz
2018-12-14 17:30:45 -05:00
0bfe1007c8
Merge branch 'master' into storageareas
2018-12-14 10:16:08 -05:00
ebaafef607
Ffmpeg logs optional ( #2345 )
...
* make ffmpeg logs configurable via web
* fix Info
2018-12-14 08:01:23 -05:00
b61eb7d4fc
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-12-13 10:53:56 -05:00
0c5eead929
Merge branch 'master' into fix_startup_db_connection
2018-12-13 10:53:34 -05:00
0c7f91c38a
Merge branch 'master' into storageareas
2018-12-03 16:25:28 -05:00
f2f1e230d1
put back missing !
2018-12-03 16:25:03 -05:00
df0b600431
Merge branch 'master' into storageareas
2018-11-29 10:49:06 -05:00
45a9f9158d
spelling mistakes
2018-11-29 10:45:30 -05:00
3f4e918b9e
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-26 15:09:14 -05:00
d6fb4e1910
Add StorageId function to clear Storage when you set a new StorageId. Clear Path when assigning a new StorageArea
2018-11-26 15:09:04 -05:00
dea5db9dd9
Merge branch 'zmaudit_check_other_storageareas' into storageareas
2018-11-23 11:11:39 -05:00
e5f2212a32
fix gpl mailing address
2018-11-15 20:00:53 -06:00
35b439629c
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-13 18:14:35 -05:00
d2dc23b4e9
fixes, better logging
2018-11-13 16:35:09 -05:00
73c52705f2
Merge branch 'fix_32bit_alignment' into storageareas
2018-11-13 14:22:06 -05:00
e8ed1367d7
Merge branch 'master' into storageareas
2018-11-13 14:22:00 -05:00
798bf68df1
add function time_of_youngest_file to determine the youngest file in an event dir, so as to guess the starttime of the event.
2018-11-13 14:13:32 -05:00
31b0ed107d
remove epadding2, to restore the 64bit alignment of startup_time. A proper fix instead of #2258
2018-11-13 14:02:44 -05:00
07d6d799ce
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-11-13 10:30:58 -05:00
993da131f1
tidy up and use Error instead of Carp::croak
2018-11-13 10:29:19 -05:00
1e98ecb595
Sort keys in to_string
2018-11-09 12:14:39 -05:00
5f81e9111f
Add Scheme and SaveJPEGs to Event fields, and fix setting Scheme
2018-11-09 12:14:05 -05:00
d6877b763d
Merge pull request #2298 from connortechnology/log_use_global_dbh
...
Use the global dbh in ZoneMinder::Database instead of keeping our own…
2018-11-07 12:29:11 -06:00
0e3eb0df17
remove extra quotes, google code style, update pod docs
2018-11-07 11:26:48 -05:00
0ebcef7324
in poddoc and over needs a =back
2018-11-07 11:01:12 -05:00
56bdd53757
Use the global dbh in ZoneMinder::Database instead of keeping our own copy of it in Logger
2018-11-07 10:40:44 -05:00
93bf05be4e
Merge branch 'zmrecover' into storageareas
2018-11-06 20:37:35 -05:00
9a96785fa4
Add in Frame.php
2018-11-06 20:37:00 -05:00
5a6ffe758a
Merge branch 'zmrecover' into storageareas
2018-11-06 15:29:02 -05:00
181a8c29e1
Add SaveJPEGs to Event
2018-11-06 15:28:37 -05:00
6d6d25261f
Merge branch 'zmrecover' into storageareas
2018-11-06 12:14:54 -05:00
3cd1887d54
Cleanup POSIX use. Fix conflict between POSIX and Date::Format.
2018-11-06 12:14:42 -05:00
aa9bb81b61
Merge branch 'zmrecover' into storageareas
2018-11-06 09:57:01 -05:00
e0bc0484d4
Add empty string default for DefaultVideo
2018-11-06 09:56:29 -05:00
18b327b4ac
Turn off massive debugging
2018-11-06 09:55:53 -05:00
e1a5940254
Merge branch 'zmrecover' into storageareas
2018-11-05 16:53:01 -05:00
451c42ddf5
Implement rmrecover script. Flush out Object code to support find, find_one, find_sql, improve to_string, etc.
2018-11-05 16:52:34 -05:00
4b24bf4e36
merge from storageareas, fully specify Module for zmDbDisconnect as we havn't 'used' it
2018-11-02 11:48:35 -04:00
372c6b7f69
explicitly call ZoneMinder::Database::zmDbDisconnect
2018-10-17 20:57:24 -04:00
7149576a7c
Merge branch 'smarter_packetqueue' into storageareas
2018-10-15 10:59:50 -04:00
7ffc5ab266
Merge branch 'master' into control_plugin_psia
2018-10-11 09:32:06 -05:00
1958351a13
Merge branch 'master' into storageareas
2018-10-09 10:24:24 -04:00
56b31becb2
Add explicit db disconnect in Fatal(). If we don't disconnect then we leave sockets hanging around in TIME_WAIT (I think).
2018-10-04 10:47:38 -04:00
33bd30fbbd
Merge branch 'master' into storageareas
2018-09-28 13:40:18 -04:00
d45406bce7
ode style and some more debug
2018-09-28 11:50:34 -04:00
e6f366c5cb
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-09-28 09:48:37 -04:00
5fd1034b0b
Add ServerId to perl Logging to DB
2018-09-25 13:53:50 -04:00
af69dab9c5
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2018-09-22 14:58:28 -04:00
6aa71dfc11
Fix calculation of LinkPath, as it was using RelativePath instead of Path
2018-09-21 10:31:11 -04:00
c7e1e7b901
Control plugin for Dahua PTZ cameras ( #2192 )
...
* Control plugin for Dahua PTZ cameras
* Update http/https protocol handling
* Update doc and license
* Remove license from top of file
* Use named regex capture groups for ControlAddress parsing
* Remove trailing whitespace in Trendnet.pm
2018-09-20 12:29:54 -04:00
f2a117c85b
fix undefined $event
2018-09-14 11:06:08 -04:00
ca3fd5ddf8
get rid of deleteEventFiles function. People should use the object method
2018-09-14 10:08:35 -04:00
11137d271e
Create utility functions in event for creating linkPath and idPath. Replace the code in Generate::createEventPath with using these nice new functions
2018-09-14 10:06:36 -04:00
63bed3af10
replace all uses of getEventPath with object function event->Path(). Remove getEventPath
2018-09-14 09:23:09 -04:00
7bcf9d59e1
Use named regex capture groups.
2018-09-12 12:55:31 +00:00
684f48979a
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-11 14:30:19 -04:00
9e8a876101
Fix finding Storage by ServerId
2018-09-09 13:28:11 -04:00
b7aa11f109
Fix infinite loop reconnecting to db in Logging
2018-09-07 16:30:24 -04:00
def72b8e66
tidy up license
2018-09-07 16:29:59 -04:00
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
c34f899d31
eliminate warning when no Storage area is set.
2018-09-04 13:57:35 -04:00
13558b2c12
convert existing http urls in help text to markdown
2018-09-04 07:39:46 -05:00
4deaa49048
Remove license from top of file
2018-09-04 10:48:28 +00:00
ce48343d1a
embed link to privacy statment in telemetry help text
2018-09-03 13:55:11 -05:00
f4c2d8adea
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-09-03 12:29:09 -04:00
b3a0b0e731
Update doc and license.
2018-09-03 14:08:59 +00:00
a3baf2c371
Update protocol selection handling
2018-09-03 14:08:52 +00:00
2074e1ccc3
use strict and remove base class methods
2018-09-03 13:51:33 +00:00
b1fe80a0bd
Add JSON/MaybeXS to dependencies, replacing JSON/Any
2018-08-30 18:30:33 -04:00
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
Steve Gilvarry
Isaac Connor
Matt N
techrockedge
Andrew Bauer
Jonathan Meredith
Pliable Pixels
Andrew Bauer
Isaac Connor
Jonathan Lassoff
Jonathan Lassoff
Andy Bauer