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

8560 Commits

Author SHA1 Message Date
Isaac Connor d1a60dedc8 Fix the overzealous use of escapeshellcmd that breaks restarting monitors 2017-03-31 11:59:55 -04:00
Isaac Connor 30455feef7 code style 2017-03-31 11:12:52 -04:00
Isaac Connor 9c495b07dd code style, whitespace, comments 2017-03-31 11:12:42 -04:00
Isaac Connor 26dfe45ec6 delete the videostore on camera delete so that the .mp4 gets written to disk 2017-03-31 11:06:15 -04:00
Andrew Bauer 7068efd581 rpmspecfile - modify tarball handling 2017-03-30 18:31:58 -05:00
Andrew Bauer 9a2c31d2c0 bump rpmspecfile to 1.30.2 release 2017-03-30 18:20:41 -05:00
Andrew Bauer 3405a540a4 Merge pull request #1843 from connortechnology/fix_1842 
Test for Controllable as well as ControlId
 2017-03-30 13:43:06 -05:00
Isaac Connor f2dcd18297 Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into storageareas 2017-03-30 13:46:30 -04:00
Kfir Itzhak 5f6332f313 Fixed the assembly in hwcaps_detect() to compile with -fpic & -fPIC and added SSE4.1, SSE4.2 and AVX detection 2017-03-30 20:35:31 +03:00
Isaac Connor d3f6ab3d29 fix Monitors filtering SQL 2017-03-30 13:06:54 -04:00
Isaac Connor 56476a7774 uppercase SQL 2017-03-30 13:05:10 -04:00
Isaac Connor 1d146b112a remark out some code that detects when the pts is < last_pts. The rest isn't implemented yet so it's bogus 2017-03-30 13:04:54 -04:00
Isaac Connor 4f2dcdacb4 update, remove styles and fix the sql for limiting monitors 2017-03-30 13:04:16 -04:00
Isaac Connor dd4550406f remove styles from montagereview and stick them in a view-specific css 2017-03-30 13:03:46 -04:00
Isaac Connor 7e3b27a130 Test for Controllable as well as ControlId 2017-03-30 10:49:02 -04:00
Isaac Connor b2db0888ae add a warning if csrf_check returns false 2017-03-30 10:46:13 -04:00
Isaac Connor 5ea77f0781 Make zones a link to zones_overview 2017-03-30 10:45:55 -04:00
Isaac Connor 538658403c Merge pull request #1822 from knnniggett/csrf 
Implement CSRF Mitigation
 2017-03-30 10:39:55 -04:00
Isaac Connor 8b7acb68a3 fix password and add debug 2017-03-29 20:07:58 -04:00
Andrew Bauer e46f64125e Update zoneminder.tmpfiles.in 
With cakephp debug mode off, we must ensure cake's tmp folders are created
 2017-03-29 13:28:15 -05:00
Isaac Connor fe223e3b29 remove a warning when adding users when not logged in (could happen if OPT_AUTH isn't turned on yet 2017-03-29 10:38:29 -04:00
Isaac Connor a0c030413a Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-29 10:19:10 -04:00
Isaac Connor 35067211e0 more the csrf to before actions.php 2017-03-29 10:19:00 -04:00
Isaac Connor 8bb9ba7bea Add more debugging 2017-03-29 09:59:58 -04:00
Isaac Connor a6261b5497 allow filters to act on unfinished events. 2017-03-29 09:39:20 -04:00
Andrew Bauer 96b14bd646 Merge pull request #1836 from connortechnology/fix_x10 
fix inserting x10 record with missing comma
 2017-03-29 08:01:28 -05:00
Andrew Bauer fe5fe63254 Update zoneminder.service.in 
This was a typo. Quotes are not needed.
 2017-03-29 07:53:15 -05:00
Michael Schupikov 184eb507a7
zm_local_camera.cpp: Improve format strings 
This avoids printing '0x0' as char and hence terminating the output too
early.
 2017-03-29 12:45:44 +02:00
Isaac Connor 8c2e8defab Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2017-03-28 20:52:36 -04:00
Isaac Connor 3cd9e46df9 Merge branch 'knnniggett-csrf' into storageareas 2017-03-28 20:44:38 -04:00
Isaac Connor d006ebfc3c Merge branch 'csrf' of https://github.com/knnniggett/ZoneMinder into knnniggett-csrf 2017-03-28 20:10:59 -04:00
Isaac Connor 74eed2ac29 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-28 20:06:12 -04:00
Isaac Connor 769af661e9 Merge branch 'fix_x10' into storageareas 2017-03-28 20:05:52 -04:00
Isaac Connor 589b369109 fix inserting x10 record with missing , 2017-03-28 20:03:46 -04:00
Andy Bauer eb55a6bb9b set action,view, and/or request to NULL if there are not defined 2017-03-28 17:52:31 -05:00
Andy Bauer 4e16ae6d19 add ZM_ENABLE_CSRF_MAGIC toggle 2017-03-28 17:29:36 -05:00
Isaac Connor 7bce7f962a Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-27 16:56:22 -04:00
Isaac Connor 6f26a9585a add libswscale3 for jessie 2017-03-27 15:43:18 -04:00
Isaac Connor 4d2fb6b7f8 don't need to reload when deleting. The row will no longer be in there 2017-03-27 13:13:48 -04:00
Isaac Connor 7b63461517 attempt to support redirecting to the given url instead of just refreshing 2017-03-27 13:13:08 -04:00
Isaac Connor 8ef7a708bd updates in filters, try to get the new filter loaded when saving with a new name 2017-03-27 13:12:37 -04:00
Kfir Itzhak 7162c62d26 Implemented a fix to get the Neon code to compile successfully with GCC < 6.0 2017-03-25 21:49:15 +03:00
Isaac Connor ed278e6c00 Merge branch 'neon' into storageareas 2017-03-24 18:02:56 -04:00
Isaac Connor 113f4b2bfe add libx264-142 for jessie 2017-03-24 18:00:18 -04:00
Isaac Connor 5800598666 put back code that got merged out 2017-03-24 13:43:56 -04:00
Isaac Connor 97a515df6e add arm neon detection 2017-03-24 13:41:10 -04:00
Andrew Bauer c69b37c4ac Merge pull request #1835 from connortechnology/setup_api_cache_dirs 
Setup api cache dirs
 2017-03-24 12:35:49 -05:00
Isaac Connor a33a8402ef Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into neon 
Conflicts:
	src/zmf.cpp
	src/zms.cpp
 2017-03-24 12:14:16 -04:00
Isaac Connor 146ac87b51 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-24 11:53:53 -04:00
Isaac Connor 7360619941 Merge branch 'master' into storageareas 2017-03-24 11:53:45 -04:00