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

7196 Commits

Author SHA1 Message Date
Andrew Bauer 81757a0465 Merge pull request #1418 from pliablepixels/1417-clone-monitor 
Clone feature added
 2016-04-20 13:02:10 -05:00
Isaac Connor 67f38d07df Merge branch 'master' into better_zmvideo 2016-04-20 12:04:15 -04:00
Isaac Connor 0ae2b0a012 Merge pull request #1427 from connortechnology/storageareas 
Storageareas
 2016-04-20 11:58:55 -04:00
Isaac Connor 44f32f46b7 deprecate zmdbFetchOne in favor of zmDbRow 2016-04-20 11:56:58 -04:00
Isaac Connor 2fcdee87d9 Merge branch 'storageareas' into valgrind 2016-04-20 10:01:30 -04:00
Isaac Connor 0da0896757 Merge branch 'master' into storageareas 2016-04-20 10:01:06 -04:00
Isaac Connor e52e880553 rework open event check to not use group by 2016-04-20 10:00:13 -04:00
Isaac Connor 71d79fac99 Merge ../ZoneMinder.SteveGilvarry into valgrind 2016-04-20 09:59:08 -04:00
Isaac Connor d2870f0692 move the mysql_free_result, looks like we can't free it until we free the row 2016-04-20 09:44:11 -04:00
Isaac Connor 060df90ff3 bump versions 2016-04-20 09:38:07 -04:00
Isaac Connor bb15915ce5 Use EventPrefix, not Prefix 2016-04-19 15:23:36 -04:00
Isaac Connor 588dbc0c3c Don't JOIN MOnitors to get event prefix. Use {->MonitorID} instead 2016-04-19 15:22:46 -04:00
Isaac Connor d9646d6ceb Populate a Monitors hash with the Monitors data so we don't have to use in JOINs later 2016-04-19 15:19:37 -04:00
Isaac Connor 5a3978f9e8 Merge pull request #1422 from abishai/master 
suppress warnings of killall for FreeBSD
 2016-04-19 14:40:37 -04:00
Isaac Connor ba3f9d1b9a Merge branch 'master' into storageareas 2016-04-19 12:03:21 -04:00
Isaac Connor b2d02a64f4 reload stream after error 2016-04-19 12:02:58 -04:00
Kyle Johnson 10589ee913 Change 'marked' row style to bootstrap 'danger' and find it with jquery 2016-04-18 15:38:10 -04:00
Kyle Johnson 2c5e04a9af Change class of delete button to be red 2016-04-18 15:38:01 -04:00
Kyle Johnson 7504d69dea Fix button alignment on console page, and add button styling 2016-04-18 15:25:48 -04:00
Kyle Johnson c9b81e07c2 Replace console table css with styles from bootstrap 2016-04-18 15:20:32 -04:00
Isaac Connor 7e1a80658b Merge branch 'master' into storageareas 2016-04-17 09:30:33 -04:00
Isaac Connor e255fcc603 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-04-17 09:30:17 -04:00
Isaac Connor d424a297c4 need php5-gd 2016-04-17 09:29:55 -04:00
Isaac Connor bc99e4c476 whitespace changes 2016-04-17 09:29:14 -04:00
Isaac Connor 98fa65310b whitespace changes 2016-04-17 09:29:00 -04:00
Isaac Connor d6f640907f add avformat_network_init 2016-04-17 09:28:43 -04:00
root 72bf8ac2b8 up the debug level for Have Keyframe 2016-04-16 15:13:36 -04:00
root 479ea17ed5 fix event menubars 2016-04-16 15:13:18 -04:00
Jan M. Hochstein 5d3f5e5a4a WSDiscovery: workaround for SOAP::WSDL QName limitation 2016-04-16 19:06:36 +02:00
abi 7058b0862a suppressed warnings of killall for FreeBSD 2016-04-16 16:39:58 +03:00
Steve Gilvarry 80f8dcbabf Merge pull request #1419 from connortechnology/feature-h264-videostorage 
Feature h264 videostorage
 2016-04-16 08:12:38 +12:00
Isaac Connor 50f2747bb4 remove the if(pages>1) so that the if > line always happens 2016-04-15 16:11:53 -04:00
Isaac Connor 2b05815bfa remove set height on the menu bars, fixing flow issues 2016-04-15 15:44:35 -04:00
Isaac Connor e4f116af2f more debug and comments, return checking 2016-04-15 15:32:48 -04:00
Isaac Connor 111b1a1566 add back lastKeyframePkt 2016-04-15 15:23:22 -04:00
Isaac Connor db52a61b01 More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash 2016-04-15 15:22:58 -04:00
Isaac Connor f1e69463b6 More debugging and restore copying lastkeyframe. Also init videoStore to NULL so that we don't crash 2016-04-15 15:22:47 -04:00
Isaac Connor b3e68ca2f7 Must init videoStore in constuctor 2016-04-15 15:10:26 -04:00
Isaac Connor 4b4add49bd Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas 2016-04-15 13:18:35 -04:00
Isaac Connor ccb5ea766d add the toggle for RecordAudio so that the checkbox works to turn off Audio 2016-04-15 13:16:52 -04:00
Isaac Connor 3f27f4893c Merge branch 'fix_grant' into storageareas 2016-04-15 12:55:13 -04:00
Isaac Connor b57abb4e54 revert 2016-04-15 12:50:51 -04:00
Isaac Connor 1e8450ecbf av_set_parameters was deprecated a long time ago 2016-04-15 12:50:05 -04:00
Steve Gilvarry b343fe2b68 Merge pull request #1416 from pliablepixels/runstate-documentation 
updated documentation to include runstates
 2016-04-15 21:48:14 +12:00
Isaac Connor 21b35c4df0 Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas 2016-04-14 22:12:52 -04:00
Isaac Connor b19f990147 Merge /home/iconnor/sandbox/ZoneMinder.connortechnology into storageareas 2016-04-14 22:12:49 -04:00
Isaac Connor 3e683e3002 Add a call to av_set_parameters, found some code that says it must be called 2016-04-14 22:12:34 -04:00
Isaac Connor bcec1813e6 More return value checking/commenting 2016-04-14 21:54:17 -04:00
arjunrc 804ac1de81 Clone feature added 2016-04-14 13:53:10 -04:00
Isaac Connor c7dceafd67 fix first param to zm_dump_stream_format 2016-04-14 12:42:47 -04:00