Isaac Connor
|
7fb0e1eaf7
|
Cache All StorageAreas and just to next event if we find the event somewhere other than where it should be.
|
2018-11-26 15:02:34 -05:00 |
Andrew Bauer
|
8301f5d039
|
add missing sql update text
|
2018-11-25 15:42:35 -06:00 |
Andrew Bauer
|
94944abd98
|
Fix triggers to sum event counts properly (#2323)
* rpm - update README
* update triggers to su mevent counts properly
* fix merge error
* merge content of triggers.sql with 1.32.3 sql update
* populate day, week, month summary tables with existing
* populate archive summary table with existing
* fix typo
* remove startime column from query
* my machine is possessed
|
2018-11-25 10:26:51 -05:00 |
|
Andrew Bauer
|
0b02996a3f
|
Update zoneminder.spec
|
2018-11-23 17:11:33 -06:00 |
Andrew Bauer
|
4e2e0c1393
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2018-11-23 16:28:00 -06:00 |
|
Andrew Bauer
|
5b211d2509
|
Merge pull request #2322 from connortechnology/fix_2317
fix #2317
|
2018-11-23 14:48:37 -06:00 |
|
Isaac Connor
|
b5430a1927
|
Merge branch 'fix_2317' into storageareas
|
2018-11-23 15:35:55 -05:00 |
|
Isaac Connor
|
6128d2a4d9
|
fix #2317 by updating the url encoding of a filter to match events for that monitor
|
2018-11-23 15:34:23 -05:00 |
|
Isaac Connor
|
1c45f98a65
|
Merge branch 'zmaudit_check_other_storageareas' into storageareas
|
2018-11-23 15:16:15 -05:00 |
|
Isaac Connor
|
1b74aa959b
|
Have to refresh the Path in the Event when updating Storage Area
|
2018-11-23 15:15:51 -05:00 |
|
Isaac Connor
|
32337c5dbb
|
fix prompt when updating StorageArea
|
2018-11-23 15:13:47 -05:00 |
|
Isaac Connor
|
2df4146266
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-11-23 13:57:32 -05:00 |
|
Isaac Connor
|
19f3cce41f
|
Dont auto-guess pathPrefix
|
2018-11-23 13:54:14 -05:00 |
|
Isaac Connor
|
7ad19be0d7
|
Merge branch 'server_path_prefix' into storageareas
|
2018-11-23 13:29:01 -05:00 |
|
Isaac Connor
|
f7965afdef
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-11-23 13:09:31 -05:00 |
|
Isaac Connor
|
1273cb863c
|
send logPrint a pre-formatted string
|
2018-11-23 13:04:46 -05:00 |
|
Isaac Connor
|
817a760559
|
send logPrint a pre-formatted string
|
2018-11-23 13:04:20 -05:00 |
|
Isaac Connor
|
c89bb8bc16
|
Merge branch 'av_logging' into storageareas
|
2018-11-23 12:46:27 -05:00 |
|
Isaac Connor
|
522ecaddd8
|
remove extra include unistd.h and we have to pre-define RecursiveMutex because we use it in zm_logger.
|
2018-11-23 12:46:10 -05:00 |
|
Isaac Connor
|
4d4666f5e0
|
add a mutex in logging functions so that multiple threads can log at the same time
|
2018-11-23 12:45:41 -05:00 |
|
Isaac Connor
|
61759a1f2d
|
older libavcodecs don't have AV_LOG_TRACE AND AV_LOG_MAX_OFFSET
|
2018-11-23 12:45:21 -05:00 |
|
Isaac Connor
|
af8626158d
|
zm_exception doesn't use anything from zm.h so don't include it
|
2018-11-23 12:44:54 -05:00 |
|
Isaac Connor
|
48564da915
|
zm_config.h shouldn't include zm.h. zm.h includs zm_config.h
|
2018-11-23 12:44:34 -05:00 |
|
Isaac Connor
|
5ad753b6b4
|
zm_comms uses logging functions, so include zm_logger.h
|
2018-11-23 12:44:10 -05:00 |
|
Isaac Connor
|
9241c26f2f
|
Move PATH_MAX to zm_config where all the other defines are
|
2018-11-23 12:43:51 -05:00 |
|
Isaac Connor
|
d16981365f
|
Merge branch 'zmaudit_check_other_storageareas' into storageareas
|
2018-11-23 12:16:21 -05:00 |
|
Isaac Connor
|
6d19280069
|
Set Scheme when Shallow. Improve debug message. Fix spacing
|
2018-11-23 12:16:11 -05:00 |
|
Isaac Connor
|
9e5d119bd8
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2018-11-23 11:11:58 -05:00 |
|
Isaac Connor
|
dea5db9dd9
|
Merge branch 'zmaudit_check_other_storageareas' into storageareas
|
2018-11-23 11:11:39 -05:00 |
|
Isaac Connor
|
73d27f5095
|
Add code to see if a db event is stored at the wrong storage area
|
2018-11-23 10:10:50 -05:00 |
Isaac Connor
|
c5f7fb7b18
|
Merge branch 'master' into server_path_prefix
|
2018-11-22 10:04:33 -05:00 |
|
Andrew Bauer
|
7ca5fa2ff8
|
rpm - update README's again
|
2018-11-21 07:58:12 -06:00 |
|
Andrew Bauer
|
daf813e877
|
spelling
|
2018-11-21 07:44:35 -06:00 |
|
Andrew Bauer
|
fa37da3f1e
|
rpm - update README
|
2018-11-20 15:47:23 -06:00 |
|
Andrew Bauer
|
fac9d69801
|
rpm - update README's
|
2018-11-20 15:36:34 -06:00 |
|
Isaac Connor
|
b291c06035
|
Working zms h265 playing.
|
2018-11-19 16:45:56 -05:00 |
|
Andrew Bauer
|
71bfd50b2c
|
Merge branch 'master' of github.com:ZoneMinder/zoneminder
|
2018-11-18 12:49:26 -06:00 |
|
Andrew Bauer
|
f867d75522
|
rpm pkg - set ownership of events folder
|
2018-11-18 12:48:41 -06:00 |
|
Andrew Bauer
|
d1219791cc
|
rpm pkg - fix api support in nginx config
|
2018-11-18 12:30:24 -06:00 |
|
Andrew Bauer
|
689665cfcc
|
rpm pkg - fgciwrap service is instantiated
|
2018-11-18 11:41:20 -06:00 |
|
Andrew Bauer
|
3b2bac0e41
|
rpm pkg - add missing asterisk
|
2018-11-18 11:31:04 -06:00 |
|
Andy Bauer
|
ac7a03233e
|
rpm pkg - change owership of log files
|
2018-11-18 11:20:47 -06:00 |
|
Andy Bauer
|
5e2935b81d
|
rpm pkg - change ownership of php session files
|
2018-11-18 11:16:46 -06:00 |
|
Andy Bauer
|
05c4f586c2
|
rpm pkg - httpd instead of apache
|
2018-11-18 10:15:27 -06:00 |
|
Andrew Bauer
|
4144fe3292
|
rpm pkg - fix php-fpm config
|
2018-11-17 21:41:25 -06:00 |
|
Andrew Bauer
|
abd178d421
|
rpm pkg - add nginx to apache group, rather than set folder perms
|
2018-11-17 19:46:15 -06:00 |
|
Andrew Bauer
|
f9b61114e2
|
Update zoneminder.apache.tmpfiles.in
|
2018-11-17 15:33:52 -06:00 |
|
Andrew Bauer
|
d3f45120f1
|
Update zoneminder.apache.tmpfiles.in
|
2018-11-17 15:25:51 -06:00 |
|
Andrew Bauer
|
ad64ca295b
|
Merge pull request #2314 from knight-of-ni/subpackages
rpm sub-packages
|
2018-11-17 12:18:19 -06:00 |
|
Andrew Bauer
|
719bdf1270
|
rpm subpackages - add readme's
|
2018-11-17 11:52:04 -06:00 |