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

7588 Commits

Author SHA1 Message Date
Stefan Lindblom 09fae00c13 Add MonitorPreset for Qihan IP cameras via RTSP 2017-01-02 09:09:53 +01:00
Isaac Connor 08cafcd722 Merge pull request #1725 from davglass/feature-h264-videostorage-SQL 
added RecordAudio to sql in README
 2017-01-01 11:44:55 -05:00
Dav Glass 0df3248fb6 added RecordAudio to sql in README 2017-01-01 08:12:42 -06: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
Isaac Connor 22c553fa79 fix to sql for timeline 2016-12-29 17:17:48 -05: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 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
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 38c0cedecc remove the use of empty which on php < 5.5 only supports variables. 2016-12-20 16:37:42 -05: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
Isaac Connor 752f0eb40b Merge branch 'master' into improve_filter 2016-12-20 11:43:02 -05: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 501cbe244d Merge pull request #7 from knnniggett/path_zms_message 
Path zms message
 2016-12-20 11:03:01 -05:00
Andrew Bauer 02e534dcff Merge pull request #1694 from connortechnology/disk_space_in_events 
Disk space in events
 2016-12-20 09:19:21 -06:00
Andrew Bauer d4c4b999e9 Merge pull request #1707 from connortechnology/log_failed_log_insert 
log failed sql when db insert fails.
 2016-12-20 09:11:24 -06:00
Andy Bauer a20da2aa71 modify ffmpeg documentation, add a note to libvlc source type 2016-12-20 08:47:02 -06:00
Andy Bauer c25dd50a21 add Remote Protocol and Remote Method to the documentation 2016-12-20 08:30:21 -06:00
Andy Bauer 09937e87f7 mention 32 bit color depth and make it preferred 2016-12-20 08:16:10 -06:00
Isaac Connor 38c31be720 typo fix pluging -> plugin 2016-12-19 22:02:44 -05:00
Isaac Connor 4e89298183 fix another typo and stop recommending that people use ZM_OPT_FAST_DELETE 2016-12-19 22:01:45 -05:00
Isaac Connor 8b726996f7 FAQ fixes, more text about zms problems in it, and adjust the socket_sendto error message to point to the FAQ entry that is relevant. 2016-12-19 21:36:39 -05:00
Isaac Connor fe3f3d91ce replace the old socket_sendto error message with something more useful so that people stop asking us how to fix it. 2016-12-16 09:12:27 -05:00
Isaac Connor 46da2ff70b Some fixes pointed out by Maxim Romanov. Also simply the loading of events to not join the Monitors table 2016-12-15 16:55:47 -05:00
Isaac Connor f6c377c2b4 Merge branch 'master' into feature-h264-videostorage 2016-12-15 16:47:32 -05:00
Andrew Bauer 68cd4c2ce5 Update zoneminder.el7.spec 
minor specfile change
 2016-12-15 08:28:37 -06:00
Isaac Connor 794043cbe9 On successful login, tell php to regenerate the session id 2016-12-14 15:06:18 -05:00
Isaac Connor ad157cf21c fix tabs 2016-12-14 14:56:54 -05:00
Isaac Connor 54f91d7c42 revert cmake code that got in from h264 2016-12-14 14:49:28 -05:00
Isaac Connor 12af44fab1 Merge branch 'master' into fix_sql_injection 2016-12-14 14:45:31 -05:00