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

7708 Commits

Author SHA1 Message Date
Isaac Connor 364a80fb94 don't output jpeg header unless there is some kind of success 2016-09-20 15:55:28 -04:00
Isaac Connor f40c8d0da8 contains due to glob 2016-09-20 15:54:37 -04:00
Isaac Connor bc0b499697 update zm_create.sql.in to match the update scripts 2016-09-20 14:10:37 -04:00
Isaac Connor 4750c016c4 define a zm version of av_frame_alloc to clean up code 2016-09-20 14:05:28 -04:00
Isaac Connor 97053df0b1 define a zm version of av_frame_alloc to clean up code 2016-09-20 14:05:25 -04:00
Isaac Connor d26f3c9a6c define a zm version of av_frame_alloc to clean up code 2016-09-20 14:05:16 -04:00
Isaac Connor a03d2a393f add ffmpeg as an option to libav-tools 2016-09-20 13:22:49 -04:00
Isaac Connor bf45f489f7 Merge branch 'storageareas' into record_audio 2016-09-20 12:38:47 -04:00
Isaac Connor 33ab9d3098 instead of filterId, use Id so that the object in is properly filled out. Add object=filter to hidden fields 2016-09-20 12:19:44 -04:00
Isaac Connor 5ce2e95fb7 replace getDiskPercent call with code to show percent for all storageareas 2016-09-20 12:18:50 -04:00
Isaac Connor fb610ba87d fix getDiskPercent to take a StorageArea as a param and use it's disk_usage_percent function. When parsing filter, DiskPercent requires a storagearea now, so look for it in the terms 2016-09-20 12:18:20 -04:00
Isaac Connor 1add270b72 fixup saving Filters and executing them 2016-09-20 12:17:19 -04:00
Isaac Connor f06723a178 add disk_usage_percent and fix whitespace 2016-09-20 12:16:49 -04:00
Isaac Connor 5604fe5610 add more debugging and fix LinkPath -> LinkPath 2016-09-20 12:16:07 -04:00
Isaac Connor a3e99cf08d quick update to Monitor to use Object methods 2016-09-20 12:15:48 -04:00
Isaac Connor 0614af4f51 work on audio encoding 2016-09-20 10:10:02 -04:00
bhaal2 78b08683a8 Merge pull request #1 from ZoneMinder/storageareas 
Storageareas
 2016-09-20 21:55:38 +10:00
Isaac Connor ae80fd4d2d put startTime init back where it belongs 2016-09-19 21:33:20 -04:00
Isaac Connor d63c1810be Merge ../ZoneMinder.master into storageareas 2016-09-19 21:09:55 -04:00
Isaac Connor cc763a858e Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-09-19 16:45:13 -04:00
Isaac Connor e228de6ebe detect relative path for ZM_PATH_EVENTS and use ZM_PATH_WEB to make a full path 2016-09-19 16:44:43 -04:00
Isaac Connor 61df6e9d75 Work on aac encoding 2016-09-16 15:54:13 -04:00
Isaac Connor 9347c550c2 Merge pull request #1628 from bhaal2/storageareas 
Fixes to getDiskPercent()
 2016-09-16 12:52:15 -04:00
bhaal2 c74af40ffb Had file open with old stuff. Fixed now. 2016-09-17 02:20:17 +10:00
bhaal2 aee6ae956d Moved '%' to getDiskPercent() where it should have been. 2016-09-17 02:13:33 +10:00
bhaal2 c95e449bbd Modifications to getDiskPercent(): 
Moved '%' to this function instead of at end of html in skins/classing/include/functions.php
Changed from SQL query to Storage area object model.
 2016-09-17 02:11:07 +10:00
Isaac Connor d4645cd94a we should be queueing packets regardless of recording state 2016-09-16 11:03:16 -04:00
Isaac Connor fbc0729c83 code cleanup, more use of av_strerr to give better error logs. 2016-09-16 10:14:58 -04:00
Isaac Connor 05f061b84b Merge ../ZoneMinder.master into packetqueue 2016-09-16 09:58:04 -04:00
Isaac Connor 9b0630a5b1 Merge branch 'master' into storageareas 2016-09-16 09:57:03 -04:00
Isaac Connor bd076fed69 Merge branch 'storageareas' into packetqueue 2016-09-16 09:56:41 -04:00
Isaac Connor 66ae5c52ae Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-09-16 09:36:41 -04:00
Isaac Connor ba73b839d4 Merge ../ZoneMinder.connortechnology into storageareas 2016-09-16 09:00:50 -04:00
Isaac Connor 18ae1298c4 need this update that converts StorageId to NOT NULL default 0 2016-09-16 09:00:34 -04:00
Isaac Connor 8871d4155d Merge branch 'startup_time' into storageareas 2016-09-15 11:47:38 -04:00
Isaac Connor 81c0b28786 fix call to setStartTime 2016-09-15 11:43:08 -04:00
Isaac Connor 06c73954d6 move set|getStartTime functions down to where they need to be. 2016-09-15 11:42:51 -04:00
Isaac Connor ae4a4681cd fix using wrong var 2016-09-15 11:41:42 -04:00
Isaac Connor 8f33ed6ca6 introduce another sharedmem variable called startup_time, which is set by zmc indicating when the process started. 2016-09-15 11:16:05 -04:00
Isaac Connor 5f46b8f942 Merge pull request #1621 from connortechnology/fix_1620 
ptzControl expects a monitor object instead of a dbrow array.
 2016-09-15 10:18:26 -04:00
Isaac Connor 2c21fe80e7 Merge pull request #1626 from bhaal2/storageareas 
Storageareas
 2016-09-15 10:18:11 -04:00
bhaal2 181339a2dd Nearly forgot its possible to have no "default" storage area, have wrapped the defaults space check in an if() 2016-09-15 19:49:58 +10:00
bhaal2 76beaf281a Changed "Disk" to "Storage" which looked better when showing disk space for all storage areas. 2016-09-15 19:44:13 +10:00
bhaal2 d5337a08a8 Modify getDiskPercent() to report disk space for all storage areas. 2016-09-15 19:41:16 +10:00
Isaac Connor 37c559ba3d Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-09-14 12:49:55 -04:00
Isaac Connor cf45feea66 quiet the logs on initial view load 2016-09-14 12:49:47 -04:00
Isaac Connor fb8b2f2490 Merge pull request #1625 from bhaal2/storageareas 
Storageareas
 2016-09-14 12:08:55 -04:00
bhaal2 01ae4de123 Modified so deleting a filter is done by table Id instead of Name 2016-09-15 01:59:31 +10:00
bhaal2 17555bf623 Added extra argument 'id' to deleteFilter function to send to delete action for deleting a filter. 2016-09-15 01:57:31 +10:00
bhaal2 67f2ddc404 Changed filter list order back to Name 
Added extra argument 'Id' to delete button onClick call
 2016-09-15 01:55:58 +10:00