Isaac Connor
|
ced208457d
|
spacing, google code style
|
2018-05-07 10:13:36 -07:00 |
Isaac Connor
|
4f1cc02f58
|
Merge ../ZoneMinder.master into storageareas
|
2018-05-07 11:08:10 -04:00 |
|
Isaac Connor
|
d31b33ffc6
|
add a code comment
|
2018-05-07 11:08:06 -04:00 |
|
Isaac Connor
|
cdf53e36e9
|
Google code style
|
2018-05-07 11:07:58 -04:00 |
|
Isaac Connor
|
b6887c277d
|
google code style
|
2018-05-07 10:27:40 -04:00 |
|
Isaac Connor
|
8ed015966b
|
add zm_terminate to main while loop
|
2018-05-07 10:27:26 -04:00 |
|
Isaac Connor
|
4d4a7a4221
|
Initialize bytes to zero in camera constructor.
|
2018-05-07 10:27:06 -04:00 |
Isaac Connor
|
5772ff9161
|
return default values for Width and Height
|
2018-05-05 12:49:00 -04:00 |
|
Isaac Connor
|
f2c099f1e4
|
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
|
2018-05-04 16:01:25 -04:00 |
|
Isaac Connor
|
d9b6f4bd85
|
test for value in DBI::errstr
|
2018-05-04 16:00:55 -04:00 |
Andrew Bauer
|
7bc2c6dbc5
|
Downgrade Unable to send stream to warning
Downgraded this from en Error to a Warning. This message can trigger following the normal closing of a monitor. Thus, it's not necessarily an error.
|
2018-05-04 12:04:28 -05:00 |
|
Isaac Connor
|
375af59657
|
use unsigned for formatting
|
2018-05-04 09:58:22 -04:00 |
|
Isaac Connor
|
dbdf937a56
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-05-04 06:47:23 -07:00 |
|
Isaac Connor
|
2076508374
|
add Source and Name filters
|
2018-05-04 06:47:02 -07:00 |
|
Isaac Connor
|
3fd953a4eb
|
Move code to generate Source from console into Monitor Object
|
2018-05-04 06:46:46 -07:00 |
|
Isaac Connor
|
8f45b50947
|
handle null and include errstr
|
2018-05-04 06:46:24 -07:00 |
Isaac
|
84c94efaa8
|
Move redunddant close methods into parent. Use Fatal instead of croak. Croak is not defined so it causes an infinite loop
|
2018-05-04 02:26:25 +02:00 |
Pliable Pixels
|
e953a04f61
|
naming consistency of attribute (#2096)
|
2018-05-03 14:03:49 -04:00 |
|
Isaac Connor
|
62f8f5cfdb
|
whitespace
|
2018-05-03 13:54:18 -04:00 |
|
Isaac Connor
|
6d5e46e91f
|
whitspace
|
2018-05-03 13:54:05 -04:00 |
|
Isaac Connor
|
67adad5d5c
|
use trylock instead of lock because our signal handler may try to log while the db is locked
|
2018-05-03 13:53:53 -04:00 |
|
Isaac Connor
|
c6fde10766
|
Implement trylock
|
2018-05-03 13:53:32 -04:00 |
|
Isaac Connor
|
769d4a8693
|
DB connect can die, so put it in an eval
|
2018-05-03 09:50:54 -07:00 |
|
Isaac Connor
|
d43cd322f4
|
Make event count a link to a filter to list them.
|
2018-05-03 09:42:14 -07:00 |
|
Isaac Connor
|
81758fab38
|
use new Thumbnail code
|
2018-05-03 09:39:23 -07:00 |
|
Isaac Connor
|
e64de07560
|
spacing
|
2018-05-03 09:39:09 -07:00 |
|
Isaac Connor
|
dbf760d8af
|
cleanup no longer needed StatusFilter code. Use class=MonitorFilter instead of id=monitorControl to be consistent
|
2018-05-03 09:38:56 -07:00 |
|
Isaac Connor
|
f76827a450
|
redo thumbnail code. Always link to server they event is located on
|
2018-05-03 09:36:50 -07:00 |
|
Isaac Connor
|
62f6e4a78a
|
Cleanup lock_and_load add some debug
|
2018-05-03 09:30:44 -07:00 |
|
Isaac Connor
|
095f4614da
|
don't move event if there are no files. Add some more debug
|
2018-05-03 09:30:06 -07:00 |
|
Isaac Connor
|
29140a3012
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-05-02 14:13:11 -07:00 |
|
Isaac Connor
|
5988bed825
|
make encodeloop return frame_size to indicate error so that we can bail
|
2018-05-02 12:21:01 -07:00 |
|
Isaac Connor
|
eea58091c8
|
add groups
|
2018-05-02 12:20:36 -07:00 |
|
Isaac Connor
|
548cbd2b66
|
add groups
|
2018-05-02 12:20:07 -07:00 |
|
Isaac Connor
|
1cd7b73114
|
turn off closing event in a separate thread, add Groups
|
2018-05-02 12:20:01 -07:00 |
|
Pliable Pixels
|
a3158fcc97
|
auth_key api for different situations (#2090)
* auth_key api for different situations
* added new flag to indicate if password needs to be appended
* pure json view
|
2018-05-02 12:26:28 -04:00 |
|
Isaac Connor
|
a1fb944afe
|
google code style and increase the logging level when reporting that the ControlDevice is wrong.
|
2018-05-02 11:45:52 -04:00 |
|
Isaac Connor
|
4e7bf6efe7
|
remove duplicated css for watch view in dark skin
|
2018-05-02 11:39:16 -04:00 |
|
Isaac Connor
|
1f5c2e2ff7
|
show ping value when not connected to db
|
2018-05-02 11:38:48 -04:00 |
|
Isaac Connor
|
d8b461806a
|
fix StartTime in the future log
|
2018-05-02 11:37:54 -04:00 |
|
Isaac Connor
|
d46c06d201
|
remove extra event=NULL and spaces
|
2018-05-01 12:19:46 -04:00 |
|
Isaac Connor
|
fb9a12ddba
|
add locking around loading Zone
|
2018-05-01 12:19:34 -04:00 |
|
Isaac Connor
|
59d5297b4b
|
fix wrong order calculating time we have waited for process to die.
|
2018-05-01 12:08:31 -04:00 |
|
Isaac Connor
|
bbe0025641
|
correct sort order default
|
2018-05-01 09:43:09 -04:00 |
|
Isaac Connor
|
11ce50925c
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-05-01 09:42:11 -04:00 |
|
Isaac Connor
|
c8eab2d275
|
remove debug log to stdout that shouldn't be there. It messes up zms
|
2018-05-01 09:41:46 -04:00 |
|
Isaac Connor
|
433cffcce7
|
include Id in Filter dropdown
|
2018-04-30 15:21:05 -04:00 |
|
Isaac Connor
|
cae2c9e237
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-30 15:11:32 -04:00 |
|
Isaac Connor
|
04198aa381
|
Log valu of dbh if not connected
|
2018-04-30 15:09:13 -04:00 |
|
Isaac Connor
|
469a7347e8
|
include zm_terminate to make Capture break out of process is TERM'd
|
2018-04-30 15:09:00 -04:00 |