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

6844 Commits

Author SHA1 Message Date
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
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
Andrew Bauer 1c948d5f8d Merge pull request #1708 from connortechnology/message_column_to_text 
Message column to text
 2016-12-13 15:21:13 -06:00
Andrew Bauer fdaf7a2ec6 Merge pull request #1709 from connortechnology/fix_1703 
Fix 1703
 2016-12-13 15:20:17 -06:00
Isaac Connor a9548d3f6b Add a config entry to turn event disk space on/off 2016-12-13 13:34:56 -05:00
Isaac Connor 30ec67d4c3 Merge branch 'master' into disk_space_in_events 2016-12-13 13:28:32 -05:00
Isaac Connor 8009bce3d9 quote the link name so that spaces don't break it 2016-12-13 13:23:20 -05:00
Isaac Connor 758a9b36a0 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-12-13 08:29:19 -05:00
Isaac Connor 5bd41fd65f db update script requires version bump to 1.30.1 2016-12-12 21:56:17 -05:00
Isaac Connor e058217a4b add a db update script to update the Messages column to a TEXT type. 2016-12-12 21:55:32 -05:00
Andrew Bauer 6fe88adc02 Update zoneminder.f25.spec 2016-12-12 20:50:53 -06:00
Isaac Connor 6fa3b25d2a fix whitespace 2016-12-12 21:44:03 -05:00
Isaac Connor 1f6a6f9758 fix whitespace 2016-12-12 21:43:07 -05:00
Isaac Connor 9b76a16af4 log failed sql when db insert fails. Also, don't permanently turn off db logging just for one failed insert 2016-12-12 21:41:55 -05:00
Andrew Bauer e72a76fe33 Update control 2016-12-12 12:09:47 -06:00
Isaac Connor 2c0a868eea fix typo 2016-12-08 11:02:59 -05:00
Andrew Bauer ecbaaef59a Merge pull request #1670 from connortechnology/fix_braces 
Fix braces
 2016-12-06 08:39:43 -06:00
Andrew Bauer 5180f325be Merge pull request #1700 from bajansen/update-nl_NL-translation 
Update nl_NL translation
 2016-12-06 08:35:32 -06:00
Isaac Connor e33245c092 Merge pull request #1702 from knnniggett/travis 
Fix Travis
 2016-12-06 08:53:33 -05:00
Andy Bauer 653c9324f9 use Travis builtin mysql service 2016-12-06 07:12:36 -06:00
Isaac Connor 42eeb2bb15 Merge pull request #1689 from knnniggett/zmswap 
Restore former zmswap path behaviour
 2016-12-05 21:49:10 -05:00
Andy Bauer 1dee6ffda3 Travis - show output from apt-get 2016-12-05 20:42:48 -06:00