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

8068 Commits

Author SHA1 Message Date
Andy Bauer c594ad8be7 rpmspec - remove quotes from pidfile path 2017-01-02 10:37:23 -06:00
Isaac Connor 0a90dbac9f require Event.php and clean up use of object vs db row array. Use newer way of using views/image.php by passing eid and frameid instead of a path. 2017-01-02 10:35:51 -05:00
Isaac Connor 30674919c4 always include Storage object, because in the end we will be using it everywhere 2017-01-02 10:34:45 -05:00
Isaac Connor f6ea52280a Update Event object to @iconnor's latest which brings us a createListThumbnail function copied from includes/functions 2017-01-02 10:34:15 -05:00
Andrew Bauer b063d8d6aa Merge pull request #1728 from connortechnology/path_zms_message 
Path zms message
 2017-01-02 08:54:32 -06:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Isaac Connor a490d02d1c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-01-02 09:34:08 -05:00
Isaac Connor da1d801935 Merge branch 'path_zms_message' of github.com:ConnorTechnology/ZoneMinder into path_zms_message 2017-01-02 09:32:43 -05:00
Isaac Connor ef71ae248c fix ramSocketFile to remSocketFile 2017-01-02 09:31:26 -05:00
Isaac Connor d97926c478 fix ramSocketFile to remSocketFile 2017-01-02 09:31:06 -05:00
Stefan Lindblom 09fae00c13 Add MonitorPreset for Qihan IP cameras via RTSP 2017-01-02 09:09:53 +01:00
Isaac Connor e36ae592cb Merge pull request #1724 from kylejohnson/issue-template 
Initial commit of github issue template.
 2016-12-31 21:59:03 -05:00
Kyle Johnson bcad334c2b Initial commit of github issue template. 2016-12-31 08:50:39 -07:00
Andrew Bauer 67b5444a98 Merge pull request #1721 from ka7/spelling 
spelling fixes
 2016-12-29 07:01:33 -06:00
klemens 0d549f1db3 spelling fixes 2016-12-29 10:31:05 +01:00
Andrew Bauer 76db2e811d more rpm specfile changes 2016-12-28 09:27:30 -06:00
Andrew Bauer ea0cfad37c update rpm specfile 2016-12-27 09:06:50 -06:00
Andy Bauer 25ab1bee18 more fixed to gpl license text 2016-12-26 10:40:09 -06:00
Andy Bauer 0f15b3ae62 update gpl 2 mailing address 2016-12-26 10:33:03 -06:00
Andrew Bauer a008b0ca76 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2016-12-26 10:08:31 -06:00
Andrew Bauer 56277bce09 minor rpm specfile changes 2016-12-26 10:07:38 -06:00
Andy Bauer 98083f58f1 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2016-12-26 09:50:05 -06:00
Andy Bauer 2dda2d9e1e remove unneeded, empty files 2016-12-26 09:49:14 -06:00
Andrew Bauer 0d1dbf1745 fix rpm specfile versioning in changelog 2016-12-26 09:31:11 -06:00
Andrew Bauer 5c5ac471d5 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder 2016-12-26 09:28:20 -06:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Andy Bauer 69c2cd697c update gpl 2 statement 2016-12-26 09:08:08 -06:00
Andrew Bauer 0dd6f4916e rpm specfile - move tmpfile config under /usr/lib 2016-12-26 08:31:21 -06:00
Andrew Bauer eb0b85ec13 changes based on feedback from rpmlint 2016-12-23 14:02:39 -06:00
Andrew Bauer 3d15ac315b Update CMakeLists.txt 
minor whitespace change
 2016-12-23 13:11:06 -06:00
Andrew Bauer 1b81d790b2 rpm specfile consolidation 2016-12-23 13:06:44 -06:00
Isaac Connor 727d4b9714 add tests when select returns true, but no bytes available, in single image mode 2016-12-23 11:27:50 -05:00
Isaac Connor d32345c1db Merge pull request #1718 from knnniggett/cmake 
bump minimum version of cmake to 2.8.7
 2016-12-23 10:30:03 -05:00
Andy Bauer 47b33917c4 bump minimum version of cmake 2016-12-23 08:56:10 -06:00
Isaac Connor ed46a6b6ac must call zmMemInvalidate before next 2016-12-23 09:27:54 -05:00
Isaac Connor 631c13ab1a revert to zmMemInvalidate 2016-12-23 09:26:38 -05:00
Isaac Connor 61d3ecf9c1 when a socket times out, use getsockopt to see if there are any errors 2016-12-22 13:31:42 -05:00
Isaac Connor 98a3d8f9f2 remove <<<< line 2016-12-22 11:02:07 -05:00
Isaac Connor 0f4b78b180 increase height of bandwidth popup 2016-12-21 10:46:42 -05:00
Isaac Connor f92edc3456 refresh stream url when changing scale 2016-12-21 10:40:47 -05:00
Andrew Bauer ce36906d1c Merge pull request #1714 from connortechnology/remove_emptys 
remove the use of empty which on php < 5.5 only supports variables.
 2016-12-20 15:49:52 -06:00
Isaac Connor 02a2fdf58f Merge branch 'remove_emptys' into storageareas 2016-12-20 16:40:42 -05:00
Isaac Connor 38c0cedecc remove the use of empty which on php < 5.5 only supports variables. 2016-12-20 16:37:42 -05:00
Isaac Connor c27d0270dc Merge branch 'knnniggett-zmMemDetach' into storageareas 2016-12-20 15:40:14 -05:00
Andy Bauer c6368c4a1a replace zmMemInvalidate with zmMemDetach 2016-12-20 13:49:07 -06:00
Andrew Bauer 02dac96cd9 more rst formatting changes 
make the note about using ffmpeg over remote->rtsp in bold
 2016-12-20 11:33:14 -06:00
Andrew Bauer 454894e3e8 fix rst formatting 
It is amazing how seemingly small changes in whitespace significantly affect the formatting
 2016-12-20 11:30:19 -06:00
Andrew Bauer 68a24040ab Merge pull request #1710 from connortechnology/path_zms_message 
replace the old socket_sendto error message with something more useful
 2016-12-20 10:30:35 -06:00
Isaac Connor ed618ff7b0 Merge branch 'master' into storageareas 2016-12-20 11:29:31 -05:00
Isaac Connor 501cbe244d Merge pull request #7 from knnniggett/path_zms_message 
Path zms message
 2016-12-20 11:03:01 -05:00