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

12296 Commits

Author SHA1 Message Date
Isaac Connor 4050763a93 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-11-29 14:38:31 -05:00
Isaac Connor af2bb992e9 Merge branch 'server_path_prefix' into storageareas 2018-11-29 14:33:46 -05:00
Isaac Connor 1c17f334d3 fix missing bits. Implement UrlToIndex in Monitor and fix use of Url(). Implement PathToApi as well 2018-11-29 14:26:30 -05:00
Isaac Connor e8622b68dc whitespace, delete dead code 2018-11-29 13:17:41 -05:00
Isaac Connor 9cbc3352b9 Implement an error count. Return -1 when it gets over 100 so that the camera will be reopened. 2018-11-29 13:09:29 -05:00
Isaac Connor af501128f2 fix invalid use of %s. Pass the buffer as the format string instead of a ... param 2018-11-29 10:54:01 -05:00
Isaac Connor 21c3ecb74a Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-11-29 10:52:25 -05:00
Isaac Connor df0b600431 Merge branch 'master' into storageareas 2018-11-29 10:49:06 -05:00
Isaac Connor 5496f6afac add cosmic and disco to ubuntu builds 2018-11-29 10:48:16 -05:00
Isaac Connor 392fa04918 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-11-29 10:45:37 -05:00
Isaac Connor 45a9f9158d spelling mistakes 2018-11-29 10:45:30 -05:00
Isaac Connor df4c429f24 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-11-29 10:32:51 -05:00
Isaac Connor a3047dbac6 fix submodules 2018-11-29 10:32:22 -05:00
Isaac Connor 2c8735e79b Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-11-29 10:27:34 -05:00
Isaac Connor d4acc9e205 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2018-11-29 10:24:58 -05:00
Isaac Connor 6e45d10a23 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-11-29 10:20:45 -05:00
Isaac Connor 1a85e282e2 use find_one instead of new. We seem to be comparing against unfound event objects 2018-11-29 10:09:49 -05:00
Isaac Connor f37f477747 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-11-29 09:58:19 -05:00
Isaac Connor c0a9fae01f Merge branch 'fix_2319' into storageareas 2018-11-29 09:57:41 -05:00
Isaac Connor 605397b565 Fix rate resetting by storing it in a cookie and using that on initial event load. Fixes #2319 2018-11-29 09:43:21 -05:00
Isaac Connor 288fa97e93 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-11-28 10:47:11 -05:00
Isaac Connor 4625f7c879 Merge branch 'master' into storageareas 2018-11-28 10:46:49 -05:00
Isaac Connor 1e915e9567 Merge branch 'master' into server_path_prefix 2018-11-28 10:45:36 -05:00
Isaac Connor 35be1d5281 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-11-28 10:41:47 -05:00
Isaac Connor 57acb2aac6 Merge branch 'server_path_prefix' into storageareas 2018-11-28 10:41:11 -05:00
Isaac Connor 81f345a9cd Add dh-systemd and dh-apache2 to build depends 2018-11-28 10:08:27 -05:00
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
Isaac Connor f5328265ef fix missing daemons definition 2018-11-28 09:12:22 -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 6de704922c Set scheme to '' if undefined to quiet warnings 2018-11-27 17:01:49 -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 e15bbba090 Make debug line more useful by printing out the containing directory 2018-11-26 15:45:05 -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
Isaac Connor 3f4e918b9e Merge branch 'zmaudit_check_other_storageareas' into storageareas 2018-11-26 15:09:14 -05:00
Isaac Connor d6fb4e1910 Add StorageId function to clear Storage when you set a new StorageId. Clear Path when assigning a new StorageArea 2018-11-26 15:09:04 -05:00
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 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