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

6276 Commits

Author SHA1 Message Date
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
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
Bernardus Jansen 986567839e
Additional minor changes 2016-12-02 10:08:49 +01:00
Bernardus Jansen e27639f599
Updated dutch translation 2016-12-02 09:49:50 +01:00
Andy Bauer 9a694541ba repm specfile maintenance: retire fc23, add fc25 2016-11-26 08:20:03 -06:00
Kyle Johnson 49620d51b9 Merge pull request #1692 from ZoneMinder/small_fixes 
Small fixes
 2016-11-24 20:42:45 -07:00
Andy Bauer bf85791e4c improvements to fedora nginx rpm support 2016-11-22 13:02:02 -06:00
Isaac Connor f712f577a2 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-11-22 13:48:19 -05:00
Andy Bauer c2b1638a3e rpm changes - set TZ var in systemd service file 2016-11-22 12:43:56 -06:00
Andy Bauer a96ab604ec rpm changes - set TZ var in systemd service file 2016-11-22 12:42:48 -06:00
Andrew Bauer 71898df756 Merge pull request #1697 from connortechnology/apache_indexes 
Apache indexes
 2016-11-22 12:33:55 -06:00
Isaac Connor aa0a4d1f5a put back mizzing F 2016-11-22 13:13:09 -05:00
Andrew Bauer c5bee3c8e1 Merge pull request #1693 from connortechnology/fix_zmwatch_stealing_dev_shm_space 
add a zmMemInvalidate at the beginning of the while loop
 2016-11-22 10:50:08 -06:00
Isaac Connor af746e2154 Merge ../ZoneMinder.master.bad into disk_space_in_events 2016-11-22 11:06:35 -05:00
Isaac Connor 406a7ebdec Merge branch 'master' of github.com:ConnorTechnology/ZoneMinder 2016-11-22 11:04:37 -05:00
Isaac Connor 9e8404516b add a zmMemInvalidate at the beginning of the while loop to catch unreleased mmap files 2016-11-22 11:02:38 -05:00
Isaac Connor 9312eed17f Merge branch 'master' into disk_space_in_events 2016-11-22 10:58:24 -05:00
Isaac Connor 02cd3e8cba Merge branch 'master' into small_fixes 2016-11-22 10:52:07 -05:00