a258ca6f9a
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
2018-08-31 19:13:50 -04:00
fd550c13ab
fix merge
2018-08-31 19:12:05 -04:00
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
14b5fc3660
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-08-31 18:43:29 -04:00
2858564155
Merge branch 'master' into storageareas
2018-08-31 16:06:13 -04:00
9ec415b30a
Just reload the event view instead of dynamically updating the stream. Fixes #2196
2018-08-31 15:56:21 -04:00
798aab84f3
whitespace changes
2018-08-31 11:58:33 -04:00
623d31edae
Don't do csrf for view=image
2018-08-31 11:58:17 -04:00
7ee80e7cca
Debug lines should be debug, not warning
2018-08-31 11:58:03 -04:00
57d5e28870
clear output buffer before sending image. Adjust filename for saveAs when doing a scaled image. whitespace corrections. More Debug output
2018-08-31 11:57:47 -04:00
f3a7a61849
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2018-08-31 10:53:26 -04:00
0823b28712
whitespace changes. Make Privacy test an else so that PRIVACY checks don't happen if not logged in
2018-08-31 10:37:11 -04:00
4b30ea7877
cleanup, whitespace
2018-08-31 10:35:23 -04:00
029c6401af
add libjson-maybexs-perl as a debian package dependency
2018-08-31 09:34:54 -05:00
799b34eee8
handle xhr errors like when auth is no longer valid. Do a page refresh when this happens
2018-08-31 10:34:54 -04:00
18c88be550
bump rpm specfile to 1.31.47
2018-08-31 07:59:51 -05:00
df3da6dd93
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-08-30 14:53:39 -04:00
0eaa539dc6
ZM_SWAP_PATH may not exist, so always try to create it
2018-08-30 14:53:27 -04:00
4e32089a48
Merge branch 'master' into storageareas
2018-08-30 14:51:27 -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
718bb6bba3
Remove zm from alter statement
2018-08-28 10:37:02 -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
Isaac Connor
Isaac Connor
Andrew Bauer
vajonam