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

5086 Commits

Author SHA1 Message Date
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
Andrew Bauer c01f21764c Merge pull request #919 from ZoneMinder/librt 
add check for gettime in librt, needed for building on pi
 2015-07-03 10:34:07 -05:00
Isaac Connor e0da473449 add check for gettime in librt, needed for building on pi 2015-07-03 10:53:23 -04:00
Isaac Connor 6d33da6245 Add ServerId to Monitors 2015-07-02 14:17:49 -04:00
Isaac Connor 5c065d4842 Merge pull request #915 from knnniggett/crud3 
Dumb down Crud from 4.0 -> 3.0.10
 2015-06-30 11:35:28 -04:00
Andrew Bauer a738011c04 Update zm_update-1.28.99.sql 
typo
 2015-06-30 10:33:09 -05:00
Andrew Bauer 1b2f214340 Dumb down Crud from 4.0 -> 3.0.10 2015-06-30 10:26:29 -05:00
Andy Bauer 3ee481771a Merge branch 'pliablepixels-898-isRunning-States' 2015-06-27 16:33:07 -05:00
Andy Bauer 1aebbec4e8 Merge branch '898-isRunning-States' of https://github.com/pliablepixels/ZoneMinder into pliablepixels-898-isRunning-States 
Conflicts:
	db/zm_create.sql.in
	db/zm_update-1.28.99.sql
 2015-06-27 16:32:32 -05:00
Andrew Bauer 64e030e794 Merge pull request #910 from ZoneMinder/multi-server 
Add Servers Table and add Id PRIMARY KEY to States
 2015-06-26 12:03:04 -05:00
Isaac Connor 09b052010e remove extra comma 2015-06-26 10:57:44 -04:00
Isaac Connor 287ff93a4d Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-06-26 10:18:11 -04:00
Isaac Connor 2fba839e8b Add Servers Table and add Id PRIMARY KEY to States 2015-06-26 10:17:07 -04:00
Isaac Connor e570fdba00 Merge pull request #909 from knnniggett/mobile_skin 
fix montage view issue in mobile skin
 2015-06-26 10:09:45 -04:00
Andrew Bauer 592ecd8e94 fix montage view issue in mobile skin 2015-06-26 08:47:20 -05:00
Isaac Connor 956e2936a3 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-06-25 16:26:49 -04:00
Isaac Connor c0c02f0d6f Merge pull request #906 from knnniggett/solaris_cmake 
Solaris cmake
Looks good to me
 2015-06-25 10:16:00 -04:00
Andrew Bauer 005d880453 typo 2015-06-25 08:07:31 -05:00
Andrew Bauer 3f6333a33d modify polkit checks & move host os check 2015-06-25 08:01:24 -05:00
Andrew Bauer 2fa81ed6b6 Merge pull request #902 from bill-mcgonigle/fix_el7_build 
Fix el7 build
 2015-06-24 06:50:09 -05:00