ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,246 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

12246 Commits

Author SHA1 Message Date
Isaac Connor a89dd83565 Update to use object instead of db row 2018-11-28 09:55:34 -05:00
Isaac Connor cd13dda294 fix use of instead of 2018-11-28 09:54:22 -05:00
Isaac Connor 2b48b09ef5 Add entries for PathToIndex and PathToZMS 2018-11-28 09:53:35 -05:00
Elmar Pruesse 9c1578e14e Add description for Stream Replay Image Buffer (#2325) 
* Add description for Stream Replay Image Buffer

I hope this is even correct.

* Update definemonitor.rst
 2018-11-27 21:49:58 -05:00
Elmar Pruesse 94d8e043ce Fix unreadable input text when OS theme dark (#2324) 
* Update skin.css

* Update skin.css
 2018-11-27 18:25:05 -05:00
Isaac Connor f8b2ff5c77 rework from Url() to PathToIndex(), PathToZMS(), UrlToIndex() and UrlToZMS() 2018-11-27 17:35:25 -05:00
Isaac Connor 8404f0ef64 When forcing an alarm, print out the event id 2018-11-26 16:21:32 -05:00
Isaac Connor 251ccc0ba9 remove extra () 2018-11-26 16:20:52 -05:00
Isaac Connor 10ce55c396 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-26 16:20:22 -05:00
Isaac Connor 17c1933913 remove an extra l 2018-11-26 16:20:15 -05:00
Isaac Connor b3703a5eed Check in db a second time for the event. Long running zmaudits can find an event in the fs that was created after we loaded all the db events. 2018-11-26 15:16:10 -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 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 1273cb863c send logPrint a pre-formatted string 2018-11-23 13:04:46 -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 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
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
Andrew Bauer f79a7e49a8 rpm subpackages - additional fixes 2018-11-17 11:32:35 -06:00
Andrew Bauer 7f7fc44b03 fix nameing of tmpfiles config 2018-11-17 11:01:12 -06:00
Andrew Bauer d06e1b075d fix filename of com.zoneminder.systemctl.rules.nginx 2018-11-17 10:47:53 -06:00
Andrew Bauer ac0e8c9b0b initial support for subpackages 2018-11-17 10:45:08 -06:00
Isaac Connor d8d9544497 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-17 10:39:52 -05:00
Isaac Connor 87140ecdb5 white space and quiet warning 2018-11-17 10:39:42 -05:00