Commit Graph

4805 Commits

Author SHA1 Message Date
Isaac Connor e3042c59a5 add php-gd to list of dependencies for debian and ubuntu builds 2015-07-16 13:40:16 -04:00
Andrew Bauer eb5bb641d6 rpm packaging - require php-gd 2015-07-16 12:15:24 -05:00
Isaac Connor ad23969982 add space instead of + to handle old Axis cameras 2015-07-16 13:06:15 -04:00
Isaac Connor 48fa0c3d42 add some utility db functions 2015-07-16 13:04:28 -04:00
Andrew Bauer a53ee60590 Merge pull request #938 from onlyjob/zmtrigger
zmtrigger: POD documentation
2015-07-16 06:47:59 -05:00
Dmitry Smirnov c788d70b93 zmtrigger: POD documentation
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-07-16 18:35:42 +10:00
Andrew Bauer 4e5ca2cead Merge pull request #937 from ZoneMinder/better_logging
improve log
2015-07-15 15:21:08 -05:00
Andrew Bauer 104f375669 Merge pull request #936 from ZoneMinder/handle_serial_trigger_problem
add error handling on failure to open serial port
2015-07-15 15:20:56 -05:00
Isaac Connor 01518d6aa9 fix. without this zmc won't restart automatically 2015-07-15 16:08:02 -04:00
Isaac Connor e4b3344a8c improve log 2015-07-15 16:06:55 -04:00
Isaac Connor cf3f160783 add error handling on failure to open serial port 2015-07-15 16:02:02 -04:00
Isaac Connor 4630bad24b add http to control url if it isn't present 2015-07-15 15:59:21 -04:00
Isaac Connor 09efee3be3 limit man install to 8 to not conflict with man pages in libzoneminder-perl 2015-07-15 15:46:53 -04:00
Isaac Connor 2f3779473b release SNAPSHOT2015071501 2015-07-15 15:45:02 -04:00
Isaac Connor 4f0466739f remove generated .debhelpers 2015-07-15 12:04:00 -04:00
Isaac Connor 7a08127d21 release snapshot 2015071501 2015-07-15 12:02:20 -04:00
Andrew Bauer a9035221cb Merge pull request #934 from ZoneMinder/fix_utf
fix utf8 ' characters
2015-07-15 10:30:28 -05:00
Andrew Bauer bf9f183552 Merge pull request #933 from ZoneMinder/issue_932
roudn up when calculating buffer size for scaled image. Fixes #932
2015-07-15 09:45:10 -05:00
Isaac Connor 33a9fc6175 fix utf8 ' characters 2015-07-15 10:37:08 -04:00
Isaac Connor 602f703df8 roudn up when calculating buffer size for scaled image. Fixes #932 2015-07-15 10:22:57 -04:00
Andrew Bauer 619464f43a Merge pull request #918 from ZoneMinder/multi-server
Add ServerId to Monitors
2015-07-14 16:07:19 -05:00
Isaac Connor 47be582354 bump version to 1.28.100 2015-07-14 16:11:27 -04:00
Isaac Connor ace8597b8d Merge branch 'master' into multi-server 2015-07-14 16:10:51 -04:00
Isaac Connor bd84830433 fix comment 2015-07-14 16:10:09 -04:00
Isaac Connor 2819585cdb move add ServerId to Monitors to zm_update-1.28.100.sql 2015-07-14 16:09:01 -04:00
Isaac Connor 9272773afa Revert "Revert "Update Dockerfile""
This reverts commit 721b00b427.
2015-07-14 16:05:04 -04:00
Isaac Connor 721b00b427 Revert "Update Dockerfile"
This reverts commit a7f5b31692.
2015-07-14 16:03:43 -04:00
Andrew Bauer a7f5b31692 Update Dockerfile
update dockerfile package requirements, particularly switch out ffmpeg packages for libav.
2015-07-14 07:12:26 -05:00
Andrew Bauer bce968ebd8 Merge pull request #923 from ZoneMinder/zm_buffer_improvements
Introduce a read_into function in the Buffer.
2015-07-13 18:51:38 -05:00
Andrew Bauer 973ec2ae80 Merge pull request #926 from ZoneMinder/version_to_1.28.99
Version to 1.28.99
2015-07-13 18:47:41 -05:00
Isaac Connor 886314a4b4 Merge pull request #931 from pliablepixels/htaccess-api-routing
Added API routing
2015-07-13 16:02:13 -04:00
Pliable Pixels 444d978c81 Added API routing 2015-07-13 18:55:28 +00:00
Andrew Bauer cfaa99a770 Merge pull request #930 from ZoneMinder/pod2man_improvement
don't include .cpp in man
2015-07-13 10:48:04 -05:00
Isaac Connor c7e30436be cleanup and add usr/share/man to core install dirs so that man files get installed 2015-07-13 11:31:23 -04:00
Isaac Connor 8b2f67c456 don't include .cpp in man 2015-07-13 11:30:32 -04:00
Isaac Connor cf74ee51c1 Merge pull request #928 from knnniggett/pod2man
fix pod2man generation for out-of-source builds
2015-07-09 20:55:41 -04:00
Andy Bauer 561bf43721 fix pod2man generation for out-of-source builds 2015-07-09 19:33:06 -05:00
Isaac Connor 04366e752a add Servers to options, a server editing popup and a server selection to monitors 2015-07-09 11:41:46 -04:00
Isaac Connor 42ac3ceb3b Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-07-09 11:00:05 -04:00
Isaac Connor 51631b84b4 cleanup generated files 2015-07-09 10:59:45 -04:00
Isaac Connor 376912158c bump version to 1.28.99 so that dbupdate scripts actually run 2015-07-07 15:47:45 -04:00
Isaac Connor bc0090f6f7 fix PRIMARY KEY update on States 2015-07-07 15:46:44 -04:00
Isaac Connor 1328ba456a fix drop primary key line. 2015-07-07 09:43:56 -04:00
Isaac Connor 994de4ae0a Introduce a read_into function in the Buffer. Use it when reading over http from a camera to remove an extra mem copy. Limit reads to 1 network buffer instead of reading everything that is available. 2015-07-06 15:57:06 -04:00
Andrew Bauer 8406818b00 Merge pull request #921 from pliablepixels/master
Added "RewriteBase /zm/api" for API routing
2015-07-05 08:34:28 -05:00
Pliable Pixels 073dd27c93 Merge pull request #1 from pliablepixels/pliablepixels-htaccess-api
Added "RewriteBase /zm/api" for API routing
2015-07-05 08:59:45 -04:00
Pliable Pixels 3a9c941213 Added "RewriteBase /zm/api" for API routing 2015-07-05 08:59:07 -04:00
Steve Gilvarry 39d152656a Merge pull request #920 from ZoneMinder/zms_no_crash
Zms no crash
2015-07-04 06:58:32 +10:00
Isaac Connor 58448adb51 Merge pull request #896 from knnniggett/pod2man
Generate man pages for perl scripts & C Binaries in the bin folder
2015-07-03 11:40:24 -04:00
Isaac Connor 3c5a9b796b Merge branch 'master' into zms_no_crash 2015-07-03 11:34:42 -04:00