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

4723 Commits

Author SHA1 Message Date
SteveGilvarry 7466553026 Sample auto generated changelog 2015-07-26 16:51:47 +10:00
Andrew Bauer a206d46248 Update README.md 2015-07-24 14:01:25 -05:00
Isaac Connor a64bbd0b56 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2015-07-24 13:42:07 -04:00
Isaac Connor 3e5f6c65d3 Fix to scale, moving the +1's into the buffer allocation instead of calculation of new_width and new_height 2015-07-24 13:30:58 -04:00
Isaac Connor b90d8c4f73 db_get fails if there is no debconf entry (for example if the package is not yet configured) 2015-07-23 15:08:06 -04:00
Isaac Connor 27ef821a4f db_get fails if there is no debconf entry (for example if the 
package is not yet configured)
 2015-07-23 15:07:32 -04:00
Andrew Bauer a6a33fa77f Merge pull request #955 from pliablepixels/953-configs-API-fix 
Fixed Configs API to return all values
 2015-07-21 12:42:41 -05:00
Pliable Pixels e332fc36a9 Fixed Configs API to return all values 2015-07-21 13:28:37 -04:00
Andrew Bauer 500b560884 Merge pull request #952 from schrorg/583-correct-de_de-encoding 
Change encoding of german language file to UTF-8
 2015-07-20 08:07:30 -05:00
Isaac Connor 02ee745167 parameter to defined should be in quotes 2015-07-17 10:09:22 -04:00
Andrew Bauer 712d3959d2 Merge pull request #951 from schrorg/950-correct-ffmpeg-source 
Show correct part of URL (hostname) for ffmpeg sources in console
 2015-07-17 08:37:17 -05:00
root a9df82256b Change encoding of web/lang/de_de.php from ISO-8859-1 to UTF-8 2015-07-17 14:24:46 +02:00
root 560a4cccbe Show correct part of URL (hostname) for ffmpeg sources in console 2015-07-17 13:59:40 +02:00
Andrew Bauer 10adae3696 Merge pull request #941 from ZoneMinder/trigger_on_space 
add space instead of + to handle old Axis cameras
 2015-07-16 13:09:36 -05:00
Andrew Bauer e1a30cf4e5 Merge pull request #942 from ZoneMinder/add_db_functions 
add some utility db functions
 2015-07-16 13:08:49 -05:00
Andrew Bauer fffea54ed1 Merge pull request #944 from ZoneMinder/php-gd 
add php-gd to list of dependencies for debian and ubuntu builds
 2015-07-16 13:08:33 -05:00
Isaac Connor 424b7d50bd php-gd should isntead be php5-gd 2015-07-16 13:59:06 -04:00
Isaac Connor ef19d5df8a Merge pull request #943 from knnniggett/php-gd 
rpm packaging - require php-gd
 2015-07-16 13:40:38 -04:00
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