Isaac Connor
|
d63594b5fa
|
don't do updates in a transaction so we don't hold locks
|
2018-01-22 14:06:52 -05:00 |
|
Isaac Connor
|
e59ade5391
|
Only alter MonitorIds if it exists.
|
2018-01-22 14:06:03 -05:00 |
|
Isaac Connor
|
843eee1e13
|
handle case where zmstats and zmstats.pl both exist
|
2018-01-22 14:05:38 -05:00 |
|
Isaac Connor
|
8a27ea3a04
|
Always populate the monitorNames object, and check for duplicate names when saving an existing Monitor as well as new monitors
|
2018-01-22 11:42:52 -05:00 |
|
Isaac Connor
|
97595051ce
|
whitespace
|
2018-01-22 11:42:19 -05:00 |
|
Isaac Connor
|
924fa80ea6
|
When renaming a monitor, take change of storage area into account when creating dirs and symlinks
|
2018-01-22 11:42:07 -05:00 |
|
Isaac Connor
|
94fc8013c6
|
use a smarter glob to pick up events that were Deep, when the storage area is now Medium.
|
2018-01-22 11:10:31 -05:00 |
|
Isaac Connor
|
b317748796
|
Add Server loading
|
2018-01-22 11:09:49 -05:00 |
|
Isaac Connor
|
493a2386c4
|
Only load Time from StartTime if it has a value. Parse Path to get LInkPath if no Time.
|
2018-01-22 11:09:35 -05:00 |
Isaac
|
c04fcfb239
|
Need a few more pixels of width to fit all preset buttons
|
2018-01-22 15:50:18 +01:00 |
|
Isaac
|
bfa0a00e67
|
dfebug improvements
|
2018-01-22 03:27:44 +01:00 |
|
Isaac
|
06c9266c62
|
use snapshot.jpg more
|
2018-01-22 03:27:01 +01:00 |
|
Isaac
|
41a05f5eef
|
simplify logic, improve debugging
|
2018-01-22 03:26:36 +01:00 |
|
Isaac
|
414930cb90
|
simplify logic, improve debugging
|
2018-01-22 03:26:33 +01:00 |
|
Isaac
|
4127aa50f3
|
simplify logic, improve debugging
|
2018-01-22 03:26:25 +01:00 |
|
Isaac
|
63351b5494
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-21 23:18:45 +01:00 |
|
Isaac Connor
|
18f0610d87
|
Merge zm_ffmpeg.cpp from zma_to_thread
|
2018-01-21 17:18:29 -05:00 |
|
Isaac Connor
|
a67c34fcad
|
Allow specifiying storagearea to audit
|
2018-01-21 17:14:32 -05:00 |
|
Isaac
|
c5332a255b
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-21 21:11:28 +01:00 |
|
Isaac
|
fedd67a7f6
|
add to_string
|
2018-01-21 21:11:05 +01:00 |
|
Isaac Connor
|
181a94de82
|
test for existence of port in url_parts
|
2018-01-21 11:10:34 -05:00 |
Andrew Bauer
|
9a8a72ba27
|
typo
|
2018-01-20 17:46:53 -06:00 |
|
Andrew Bauer
|
06c2c18135
|
fix url to display properly
|
2018-01-20 17:46:15 -06:00 |
|
Andrew Bauer
|
8dc6910bbd
|
Remove reference to zm 1.29, update description of isaac's ppa
|
2018-01-20 17:34:37 -06:00 |
|
Isaac Connor
|
bd2da456f4
|
handle non-multi-server case when restarting monitors via API
|
2018-01-19 21:09:33 -05:00 |
|
Isaac Connor
|
6d46a02a9a
|
DbReconnect if the db connection goes down
|
2018-01-19 18:25:24 -05:00 |
|
Isaac Connor
|
43d72decac
|
Turn off extra debugging
|
2018-01-19 18:24:59 -05:00 |
|
Isaac Connor
|
1291835c45
|
do some output to tell use what we are doing during update process
|
2018-01-19 16:32:48 -05:00 |
|
Isaac Connor
|
2682686063
|
Must disconnect and reconnect before calling update script
|
2018-01-19 16:32:26 -05:00 |
|
Andrew Bauer
|
32bf57d35b
|
docker support files moved to zmdockerfiles
|
2018-01-19 15:15:11 -06:00 |
|
Isaac Connor
|
e372a490fa
|
bump version
|
2018-01-19 13:32:58 -05:00 |
|
Isaac Connor
|
dfce773341
|
We should return the value of DiskSpace
|
2018-01-19 13:32:28 -05:00 |
|
Isaac Connor
|
a03ceec154
|
Fix Day=>Wek
|
2018-01-19 13:29:45 -05:00 |
|
Isaac
|
62704601ca
|
We should return the value of DIskSpace
|
2018-01-19 19:22:43 +01:00 |
|
Isaac Connor
|
bc792a8325
|
Use coalesce to handle NULLs
|
2018-01-19 13:09:46 -05:00 |
|
Isaac Connor
|
e8603b6065
|
Use coalesce to handle NULLs
|
2018-01-19 13:08:13 -05:00 |
|
Isaac Connor
|
b5d1e1e5a2
|
update triggers to use coalesce
|
2018-01-19 13:03:47 -05:00 |
|
Isaac Connor
|
033d8e9cd8
|
add update
|
2018-01-19 12:17:42 -05:00 |
|
Isaac Connor
|
e26747b5cc
|
show port when it's not the standard port
|
2018-01-19 12:15:26 -05:00 |
|
Isaac Connor
|
f4b6360f14
|
bump version
|
2018-01-19 12:15:12 -05:00 |
|
Isaac Connor
|
2ce68e83c5
|
Update TotalEvents on event_insertion
|
2018-01-19 12:15:05 -05:00 |
|
Isaac Connor
|
8935b77a12
|
Add a CTRL-C INT handler as well. Log more info about deleting events
|
2018-01-19 12:14:36 -05:00 |
|
Isaac Connor
|
17a29f7e83
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-01-19 11:40:14 -05:00 |
|
Isaac Connor
|
4d9f90488f
|
Add a TERM and HUP handler, clean up pid file on term. Add --force command line option to tell zmaudit.pl to continue even if a pid file exists.
|
2018-01-19 11:40:07 -05:00 |
|
Isaac Connor
|
9fb1074875
|
add auto-scheme detection from path. Fix de-tainting in delete_files
|
2018-01-19 11:39:31 -05:00 |
Isaac Connor
|
3749eb3e6f
|
Only send kill once. No point in repeating it
|
2018-01-19 08:19:10 -08:00 |
|
Isaac Connor
|
773ed11742
|
use Object methods to restart zmc and zma. restart them on save of existing Monitor
|
2018-01-19 08:17:53 -08:00 |
|
Isaac Connor
|
d1dbf4cc31
|
Turn off debug
|
2018-01-19 08:17:33 -08:00 |
|
Isaac Connor
|
3abd873c34
|
Turn off debug
|
2018-01-19 08:17:17 -08:00 |
|
Isaac Connor
|
0f3cf33565
|
Move unparse_url from add_monitors to functions to make it generally available
|
2018-01-19 08:16:52 -08:00 |