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
60d5880694
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
2018-12-29 19:36:20 -05:00
2cac25d353
removed unused preset code
2018-12-29 19:35:16 -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
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
3e06bbcef8
Merge branch 'master' into storageareas
2018-12-27 13:50:29 -05:00
08e5166bcb
remove quotes around state in command documentation.
2018-12-27 12:24:50 -05:00
c017219a1e
use do instead of many lines of dbi. Cleanup logic around command detection
2018-12-27 12:22:06 -05:00
f815aaa5f5
Merge branch 'master' of git://github.com/ZoneMinder/zoneminder
2018-12-21 19:46:45 -05:00
7a8beffdcc
Merge branch 'master' into storageareas
2018-12-20 15:10:52 -05:00
e626049f6b
Merge branch 'swresample' into storageareas
2018-12-20 14:08:40 -05:00
0c09616059
put back privacy notice update
2018-12-20 13:58:09 -05:00
88e148068e
Logging and whitespace
2018-12-20 13:56:57 -05:00
6af8f0d419
Logging and whitespace
2018-12-20 13:55:18 -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
3a068ae6a3
Merge branch 'master' into swresample
2018-12-16 16:15:28 -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
db81465fa2
allow one to set manpage destination
2018-12-07 09:47:00 -06: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
14272a42b4
fix use of getcwd in delete_empty_subdirs. We use absolute paths
2018-12-03 11:08:24 -05:00
Isaac Connor
Steve Gilvarry
Isaac Connor
Matt N
techrockedge
Andrew Bauer
Jonathan Meredith
Pliable Pixels