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 |
|
Isaac Connor
|
acd6b5f4a9
|
limit the # of log lines deleted to 100 to limit the time spent there.
|
2018-04-30 14:33:41 -04:00 |
|
Isaac Connor
|
3bb1a5b544
|
Whitespace
|
2018-04-30 13:02:53 -04:00 |
|
Isaac Connor
|
f4b6bde3c2
|
Put print to STDERR before logging to db because it is more reliable than db
|
2018-04-30 13:02:43 -04:00 |
|
Isaac Connor
|
8e5ee94420
|
If we fail to connect, the dbh->trace will crash
|
2018-04-30 13:02:13 -04:00 |
|
Isaac Connor
|
c3b6cd4bab
|
include auth.php if auth is on, and return '' for auth_hash is auth is disabled
|
2018-04-30 11:24:53 -04:00 |
|
Isaac Connor
|
3c9c05891f
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-30 07:58:02 -07:00 |
|
Isaac Connor
|
d3a611ae49
|
google code style. sth does not have a errstr() method.
|
2018-04-30 07:56:51 -07:00 |
|
Isaac Connor
|
619feb0dfa
|
Merge ../ZoneMinder.master into storageareas
|
2018-04-30 10:19:17 -04:00 |
|
Isaac Connor
|
2845f891bc
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-30 10:12:41 -04:00 |
|
Isaac Connor
|
e55846e716
|
Log start_time when its > Now
|
2018-04-30 10:12:34 -04:00 |
|
Isaac Connor
|
6c5e6e6184
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-30 07:10:38 -07:00 |
|
Isaac Connor
|
3f05d46012
|
Merge zmdc.pl fixes. We can now handle database disconnects gracefully.
|
2018-04-30 07:09:23 -07:00 |
|
Isaac Connor
|
5ebfae5f14
|
fix warnings in building docs by using anonymous links (double underscore at the end)
|
2018-04-30 09:51:26 -04:00 |
|
Isaac Connor
|
f61bdcd118
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-04-29 10:53:31 -04:00 |
|
Isaac Connor
|
e891c88a3e
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2018-04-28 12:38:57 -04:00 |
|
Isaac Connor
|
abd52ebfb1
|
Add DiskSpace column to storage listing
|
2018-04-28 12:38:10 -04:00 |
|
Isaac Connor
|
ecf8003aef
|
remove extra spaces
|
2018-04-28 12:32:21 -04:00 |
|
Isaac Connor
|
a4da624f4c
|
break out of loops when zm-terminate is set
|
2018-04-27 13:20:38 -07:00 |
|
Isaac Connor
|
d5fedd5470
|
Update to add cache dir config and api configs
|
2018-04-27 11:25:01 -04:00 |