fd550c13ab
fix merge
2018-08-31 19:12:05 -04:00
42c6d90339
Merge branch 'storageareas' into zma_to_thread
2018-08-25 09:58:51 -04:00
f2d4739838
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-24 17:11:39 -04:00
24f0ed7e03
Merge branch 'master' into storageareas
2018-08-24 12:26:59 -04:00
c271948f3d
bump version to 1.31.47
2018-08-24 12:26:44 -04:00
1ff2469099
Merge branch 'master' into storageareas
2018-08-24 10:49:57 -04:00
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
4be2a0501c
Merge branch 'master' into storageareas
2018-08-22 17:22:54 -04:00
21d193294f
Log errors shouldn't be fatal
2018-08-22 17:22:40 -04:00
d296d59625
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-22 16:34:29 -04:00
627d47980a
prevent killall zombies by ignoring SIGCHLD at startup
2018-08-22 16:33:11 -04:00
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
459a88a5e7
Merge branch 'master' into ip_webcam_preset
2018-08-22 11:23:56 -04:00
90eda0b88b
spacing, remove extra parenthesis
2018-08-22 11:14:00 -04:00
8742388acd
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-22 09:31:51 -04:00
4e30a9e71c
Stats.EventId must be a bigint too
2018-08-21 12:50:33 -04:00
24f8d63b69
comment out a debug line
2018-08-20 11:13:38 -04:00
cd6dd28280
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-08-17 16:15:30 -04:00
db560a5540
Don't do delay calcs if delay is empty, result will always be negative
2018-08-17 16:06:30 -04:00
abb6d4f7d9
fixup some logic, remove redundant call to clearQueue, increase first_video_packet_index when clearing video frames from front in queuePacket
2018-08-17 16:06:03 -04:00
53eae61883
Mostly spacing, but simplified logic removing assumption that local cameras give keyframes. They might not in future.
2018-08-17 16:05:02 -04:00
376e15b763
trylock was interesting for debugging, but really logging should wait for the lock
2018-08-17 16:04:12 -04:00
96a1ac14e8
Don't do all the event notes stuff if notes is empty
2018-08-17 16:02:40 -04:00
871e3807e6
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-17 12:57:27 -04:00
1fa78c5aa8
Fix up licensing and copyright
2018-08-17 08:14:13 -04:00
40cd27e68a
when refreshing because ajax failed, reload the current view, not just index.php
2018-08-15 17:21:54 -04:00
2a4508b598
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-15 08:28:56 -04:00
bb70c9f14e
Cleanup Licenses. Fixes #1276
2018-08-15 08:28:44 -04:00
d768f5f7fc
Merge branch 'master' into storageareas
2018-08-13 15:35:55 -04:00
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
2018-08-13 15:33:43 -04:00
026390ccd8
Merge branch 'master' into storageareas
2018-08-13 15:26:29 -04:00
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
3ab542199c
Merge branch 'master' into storageareas
2018-08-13 11:17:04 -04:00
e6d1a9447e
rename TVIP862 to Trendnet and delete TVIP672WI
2018-08-13 11:12:15 -04:00
67a3ff392b
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-13 11:07:13 -04:00
70ba0ad342
Merge https://github.com/michaelbarkdoll/ZoneMinder into trendnet
2018-08-13 11:05:50 -04:00
5b1f8fbd71
initialize more vars in constructor
2018-08-13 10:01:39 -04:00
1016096a00
spacing
2018-08-13 10:01:27 -04:00
59b0160144
use ++it instead of it++
2018-08-13 10:01:16 -04:00
4670a7f26b
move variables into deeper block
2018-08-13 10:01:04 -04:00
4297d39df6
spacing, code style, remove useless debug logging
2018-08-11 18:49:48 -04:00
b2c9c2961d
spacing, code style, remove useless debug logging
2018-08-11 18:49:30 -04:00
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
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
3b86d9255b
adjust some spacing
2018-08-10 11:16:27 -04:00
744884203c
adjust some spacing
2018-08-10 11:16:20 -04:00
a335eb66de
remove some extra braces
2018-08-10 11:16:04 -04:00
f2525253bb
spacing, remove excess parenthesis etc
2018-08-10 11:15:51 -04:00
185586ecd4
we must try to create the SOCK_DIR because nowadays systemd is chrooting processes and PATH_SOCKS may not exist
2018-08-10 11:15:15 -04:00
97a6a28182
You should just mkdir and handle EEXIST because stating first is a race condition
2018-08-10 11:14:41 -04:00
Isaac Connor
vajonam
Isaac Connor
Andrew Bauer