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

8285 Commits

Author SHA1 Message Date
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
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 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 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 8b7acb68a3 fix password and add debug 2017-03-29 20:07:58 -04: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
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 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
Isaac Connor 7c86bcdfce add the link from /usr/share/zoneminder/www/api/app/tmp to /var/tmp 2017-03-24 11:52:55 -04:00
Isaac Connor f082183fd6 add the cache directories used by cake php under /var/tmp 2017-03-24 11:52:29 -04:00
Isaac Connor 99a011da77 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-03-23 19:56:01 -04:00
Isaac Connor 56acea30fe implement a command line option to limit the monitor to which zmaudit is doing it's job 2017-03-23 19:54:16 -04:00
Andrew Bauer a43adc241f fix incorrect gpl license mailing address 2017-03-22 07:03:53 -05:00
Isaac Connor eaca58bb7c Merge pull request #1815 from mnoorenberghe/postlogin 
Properly escape postLoginQuery. Fixes #1797
 2017-03-21 10:27:13 -04:00
Isaac Connor 730d76189d Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-21 09:53:41 -04:00
Isaac Connor 670c1a3c7c pass NULL for ['width'] 2017-03-21 09:47:07 -04:00
Isaac Connor 676f92d3f1 Merge pull request #1828 from mnoorenberghe/api_user_enabled 
Fix check that API user is enabled
 2017-03-20 21:09:14 -04:00
Matthew Noorenberghe ea558c79a0 Fix check that API user is enabled 2017-03-20 17:16:24 -07:00
Isaac Connor df5a238857 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-03-20 15:14:50 -04:00
Isaac Connor 0cd2e346d3 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-03-20 15:13:41 -04:00
Isaac Connor 0a1b2eab01 Merge branch 'uri_decode_in_zms' into storageareas 2017-03-20 15:13:19 -04:00
Isaac Connor f5dc896a45 missed one case 2017-03-20 15:12:23 -04:00