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

13444 Commits

Author SHA1 Message Date
Isaac Connor 2eebdb094c move chosen setup to initPage 2019-05-24 11:54:14 -04:00
Isaac Connor b6747e9b1f spacing 2019-05-24 11:49:59 -04:00
Isaac Connor 3dd5caebca fix quotes and stop merging lines of options help. Change MaxFPS help to advise against setting a value 2019-05-24 11:49:27 -04:00
Isaac Connor 0a8b7c24db don't check for alarmed zones to record stats for unless we are alarmed 2019-05-24 10:52:31 -04:00
Isaac Connor 729dee5dda Merge branch 'master' into storageareas 2019-05-24 10:06:14 -04:00
Isaac Connor db9ba7eeab Add StartDateTime and EndDateTime as Sort options. Fixes #2614 2019-05-24 10:02:15 -04:00
Isaac Connor c02eb2cd46 spacing 2019-05-24 10:00:51 -04:00
Isaac Connor 4e51379087 spacing 2019-05-24 10:00:15 -04:00
Isaac Connor f9004443cf Merge branch 'master' into storageareas 2019-05-24 09:37:03 -04:00
Isaac Connor 843a9a6630 Merge branch 'pliablepixels-crypt-replacement3' into storageareas 2019-05-24 09:36:54 -04:00
Isaac Connor 2fc7b3cf4d Don't allow deleting of in-progress recording 2019-05-24 09:31:48 -04:00
Isaac Connor aa1264f4d2 fix missing ] 2019-05-23 16:26:40 -04:00
Isaac Connor 3be0b774bd better error logging 2019-05-23 16:26:21 -04:00
Isaac Connor 4466ef13fd Merge branch 'pliablepixels-crypt-replacement3' into storageareas 2019-05-23 15:21:58 -04:00
Isaac Connor 7559c975e3 Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement3 2019-05-23 15:15:52 -04:00
Isaac Connor 883688a72d Add auth hash verification to the user logged in already case 2019-05-23 15:15:37 -04:00
Pliable Pixels 57708c016c dont need AUTH HASH LOGIN to be on 2019-05-23 14:59:21 -04:00
Pliable Pixels b04875676c
Merge pull request #2 from connortechnology/pliablepixels-crypt-replacement3 
Pliablepixels crypt replacement3
 2019-05-23 14:56:41 -04:00
Isaac Connor d5120f7506 regenerate auth hash if doing password migration 2019-05-23 14:30:45 -04:00
Isaac Connor bc9116dd94 whitespace and google code style 2019-05-23 14:27:17 -04:00
Isaac Connor 2bf022d69c Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement3 2019-05-23 14:26:05 -04:00
Pliable Pixels 6dd1bbe895 moved to ZM fork for bcrypt 2019-05-23 13:52:54 -04:00
Isaac Connor bdbbab0d3e Handle no results from get_ProbeMatch() 2019-05-21 17:15:08 -04:00
Isaac Connor 2ce2381269 Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement 2019-05-19 08:45:42 -04:00
Pliable Pixels ddd02ec10d clean up of API, remove redundant sections 2019-05-19 07:29:27 -04:00
Pliable Pixels 036d47545f small API fixes 2019-05-18 19:35:13 -04:00
Pliable Pixels 33db7e1e35 add libssl1.0.0 for ubuntu 16/12 2019-05-18 13:47:31 -04:00
Pliable Pixels 8e1037458a when regenerating using refresh tokens, username needs to be derived from the refresh token, as no session would exist 2019-05-18 11:23:16 -04:00
Pliable Pixels 304192472d removed extra line 2019-05-17 12:02:24 -04:00
Pliable Pixels 682d95470d spaces 2019-05-17 11:47:20 -04:00
Isaac Connor 88a58243bc Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement 2019-05-17 11:24:40 -04:00
Pliable Pixels e2dd11fdd4 added deps to ubuntu control files 2019-05-17 11:21:07 -04:00
Isaac Connor e9ff1f46f1 Add missing deps to ubuntu versions of control 2019-05-17 11:13:45 -04:00
Isaac Connor 93aeceecfc Merge branch 'crypt-replacement' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-crypt-replacement 2019-05-17 10:18:15 -04:00
Isaac Connor de924f25b3 Merge branch 'storageareas' of github.com:connortechnology/zoneminder into storageareas 2019-05-17 10:16:50 -04:00
Isaac Connor 3888d140a8 Merge branch 'master' into storageareas 2019-05-17 10:16:29 -04:00
Isaac Connor 84b389a2bc Merge branch 'test_error_db_creation' into storageareas 2019-05-17 10:16:26 -04:00
Pliable Pixels a4eff3e8e0 fixed html typo 2019-05-17 09:44:22 -04:00
Pliable Pixels 923f798e69 css classess for text that disappear 2019-05-17 09:32:23 -04:00
Isaac Connor 17e0b4ac4b test for error code from db creation and if there is an error, die with an error code. 2019-05-17 08:34:19 -04:00
Pliable Pixels 06eb9a3bb2 merge typo 2019-05-16 16:15:16 -04:00
Pliable Pixels 915e9f05a9 merged fifo changes 2019-05-16 16:14:06 -04:00
Isaac Connor 96f578f1bd
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup. (#2604) 2019-05-16 15:37:37 -04:00
Mitch Capper eb005e8b9c FIFO support for zoneminder zone debugging (#2594) 
Adds fifo options for diagnostic images for much lower impact diagnostics mode.  Diagnostic images are only written when there is a client listening for them (otherwise they are skipped).  Also added a json stream for the detection data so you can see in real time the pixels or blobs detected for the motion.  This allows for easy real time stream of both delta and reference images (as video streams) along with the detection numbers.
 2019-05-16 15:37:03 -04:00
Isaac Connor 4f44db8cbf
ifdef HAVE_ZLIB_H around code that uses Image->Zip (#2597) 2019-05-16 15:35:19 -04:00
Pliable Pixels 0e72080c4a Migrate from libdigest to crypt-eks-blowfish due to notice 2019-05-16 09:37:11 -04:00
Isaac Connor 228acb8794 Merge branch 'master' into storageareas 2019-05-15 19:35:47 -04:00
Isaac Connor 1855ee441a Fix #2609 invalid value horz instead of hori in orientations enumeration 2019-05-15 19:35:19 -04:00
Pliable Pixels a07da01f0c reworked API document for new changes in 2.0 2019-05-15 13:57:51 -04:00
Pliable Pixels 95460a945a added token support to index.php 2019-05-14 19:22:49 -04:00