Commit Graph

6388 Commits

Author SHA1 Message Date
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
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
Isaac Connor 69c39f8a23 set http_only flag in cookie settings 2016-12-14 14:39:44 -05:00
Isaac Connor 1ff7ed3aed Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-12-14 14:36:42 -05:00
Isaac Connor af4cfd009c Merge branch 'master' of github.com:connortechnology/ZoneMinder 2016-12-14 14:36:36 -05: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 b5e4c94682 test for integer string as well 2016-12-08 15:58:00 -05:00
Isaac Connor 7c84e2417d remove extra ? 2016-12-08 15:53:38 -05:00
Isaac Connor c8009baf3f fix missing ; and test for integer string in limit 2016-12-08 15:46:42 -05:00
Isaac Connor d600eb0e8b Merge branch 'master' into fix_sql_injection 2016-12-08 13:39:04 -05:00
Isaac Connor e7d0861530 check limit for a valid integer and complain if not. 2016-12-08 13:37:23 -05:00
Isaac Connor 587fd16aa6 Add testing for limit, sortField and all the filters to ensure that they are valid. 2016-12-08 13:31:44 -05:00
Isaac Connor 75b8c35059 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-12-08 11:13:33 -05:00
Isaac Connor 2c0a868eea fix typo 2016-12-08 11:02:59 -05:00
Isaac Connor fbc47359eb Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2016-12-06 11:55:26 -05:00
Andrew Bauer ecbaaef59a Merge pull request #1670 from connortechnology/fix_braces
Fix braces
2016-12-06 08:39:43 -06:00
Isaac Connor 0b3ba0a06d fix detection of LIBSWRESAMPLE 2016-12-06 09:38:06 -05: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