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

7930 Commits

Author SHA1 Message Date
Andrew Bauer 29e48da3b9 fix sftp xfers in zmfilter (#1677) 2016-11-07 16:08:43 -05:00
Andrew Bauer 976c2eee0f Merge pull request #1672 from kylejohnson/1671-watch-view-event-delete 
Fix event deletion from watch view.  Fixes #1671
 2016-11-06 18:57:43 -06:00
Kyle Johnson 735d2df3c9 event is redefined before being passed to deleteEvent. Fixes #1671 2016-11-04 23:23:40 -06:00
Isaac Connor 0dbde8e290 correct a lot of braces 2016-11-04 15:53:14 -04:00
Isaac Connor 4613e5390d Merge ../ZoneMinder.master 2016-11-04 15:23:05 -04:00
Kyle Johnson ae0afaed0c Merge pull request #1666 from connortechnology/fix_whitespace 
tabs to spaces
 2016-11-04 12:55:14 -06:00
Isaac Connor 8a6a8fab5b Merge pull request #5 from ZoneMinder/master 
merge upstream master
 2016-11-04 14:35:58 -04:00
Isaac Connor 93725b3f4b fixup spacing in ConfigData 2016-11-04 14:05:51 -04:00
Kyle Johnson ae1abe99ab Merge pull request #1668 from zestysoft/Memory-Map-FAQ-Additional-Details 
Add additional details to increasing mapped memory.
 2016-11-04 11:24:15 -06:00
Ian b813b51f2b Revert "Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details" 
This reverts commit aa74660aa4, reversing
changes made to 749a90f199.
 2016-11-04 07:15:21 -07:00
Isaac Connor ad898d6ffe Merge pull request #1669 from zestysoft/UserGuide-FilteredPixelsDescription-Fix 
Fix FilteredPixels Mode description
 2016-11-04 09:02:03 -04:00
Ian 1f8e497ab9 Fix FilteredPixels Mode description 
The FilteredPixels mode description incorrectly states that
AlarmedPixel analysis happens twice.
 2016-11-03 23:24:31 -07:00
Ian aa74660aa4 Merge branch 'reword-create_analysis_images-help' into Memory-Map-FAQ-Additional-Details 2016-11-03 23:08:05 -07:00
Ian 749a90f199 Add additional details to increasing mapped memory. 
Other distro’s do not use /run/shm as the memory mapped path, so added
information to cover this case.

Also filtered the output of df to focus our attention on the only mount
points that matter here.
 2016-11-03 22:43:07 -07:00
Ian 60794fab1e Change CREATE_ANALYSIS_IMAGES Help text 
The existing help text didn’t fully explain how blobs play a part in
this functionality.
 2016-11-03 15:58:16 -07:00
Isaac Connor 5c62c654ce fix WatchScale -> EventScale 2016-11-03 16:47:22 -04:00
Isaac Connor 11b160b7d1 document code blocks 2016-11-03 16:44:03 -04:00
Isaac Connor dbd7d7d095 fix crash when not compiled with sws_resample 2016-11-03 16:43:48 -04:00
Isaac Connor 53166fabf5 Merge branch 'master' into storageareas 2016-11-03 14:59:06 -04:00
Isaac Connor cb69d1a693 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2016-11-03 14:57:29 -04:00
Isaac Connor ebd2d050bf Merge branch 'master' into fix_whitespace 2016-11-03 14:42:18 -04:00
Kyle Johnson bd47439056 Merge pull request #1639 from connortechnology/cookie_scale 
store the scale value for watch and event views in a cookie, differen…
 2016-11-03 12:35:15 -06:00
Isaac Connor 099cca210b fix monitorId to MonitorId 2016-11-03 14:34:17 -04:00
Isaac Connor 3d17067276 change tabs to spaces 2016-11-03 14:30:23 -04:00
Isaac Connor 68c8178648 remove some extra spaces 2016-11-03 14:21:07 -04:00
Isaac Connor bb371612c3 tabs to spaces 2016-11-03 14:18:03 -04:00
Isaac Connor 6d57b326fa change logic of sending file contents to handle an off by one and be more readable 2016-11-03 11:42:42 -04:00
Isaac Connor 9d76c9cf6a fix fclose 2016-11-03 11:23:50 -04:00
Isaac Connor a87f5e1592 fix sending full content when we should be 2016-11-03 11:23:10 -04:00
Isaac Connor 0ea8461192 remove extra s 2016-11-03 09:43:38 -04:00
Isaac Connor 2f22eb5a8c fix error when only 1 monitor is listed 2016-11-03 09:41:54 -04:00
Andy Bauer 1bdcd39a50 add quotes to handle values with spaces 2016-10-31 20:37:58 -05:00
Andrew Bauer 9f84aaa537 surround variables w/quotes to process data with spaces 2016-10-31 08:46:05 -05:00
Steve Gilvarry d504043a9e Update ru_ru.php 
Remote extra line
 2016-11-01 00:32:46 +11:00
Isaac Connor ca69a79bed fix video.js not being included when we are viewing an event without an h264 file, and when buttons do not exist. 2016-10-27 17:05:33 -04:00
Isaac Connor a7c1231b46 fix WatchScale -> EventScale 2016-10-26 14:53:24 -04:00
Isaac Connor 340b172dc4 Merge branch 'add_scale_to_frame_view' into storageareas 2016-10-26 14:46:50 -04:00
Isaac Connor fb96b262d7 Merge ../ZoneMinder.master into storageareas 2016-10-26 14:46:39 -04:00
Isaac Connor 6a16db0361 get rid of extra line feed 2016-10-26 14:45:13 -04:00
Isaac Connor 42783b68f9 float the scale control right, add css for other skins 2016-10-26 14:43:23 -04:00
Isaac Connor 4defad1352 Merge branch 'add_scale_to_frame_view' into storageareas 2016-10-26 14:04:43 -04:00
Isaac Connor d9a31f7fb6 Merge branch 'master' into storageareas 2016-10-26 13:39:31 -04:00
Isaac Connor c74cc54ac0 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2016-10-26 13:34:30 -04:00
Isaac Connor 98cde11e86 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2016-10-26 13:34:28 -04:00
Isaac Connor cf0e4935f1 cleanups, more debugging 
Also, when adding a monitor, a user who is restricted to monitors can't create one, add an error essage about it instead of failing silently.
 2016-10-21 12:43:23 -04:00
Isaac Connor f9ac601194 fix getOutputHelperStream -> getHelperStream 2016-10-21 12:41:37 -04:00
Isaac Connor 7b1395a4ea set default for StorageId to '0' since it can't be NULL anymore 2016-10-20 14:06:09 -04:00
Isaac Connor f153e9b8fb MontageReview should only be visisble to people who can view events. Fix running state 2016-10-20 13:38:12 -04:00
Isaac Connor ea27e07276 add indexes for Monitors(ServerId) and Servers(Name) 2016-10-20 13:19:41 -04:00
Isaac Connor 4fc85fd89c add indexes for Monitors(ServerId) and Servers(Name) 2016-10-20 13:18:33 -04:00