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

4017 Commits

Author SHA1 Message Date
Andrew Bauer 62b75808b3 Output to stderror when zmu can't read zm.conf 2014-12-10 17:54:09 -06:00
Isaac Connor ed61d2b925 alter the type of Device in the Monitors table to tinytext, which matches the MonitorPresets table, and increases the length to 255 2014-12-10 16:56:22 -05:00
Isaac Connor 48f4d7eb93 Merge branch 'master' into BSD_device 2014-12-08 16:53:39 -05:00
Isaac Connor fafef86298 Merge branch 'control_improvements' 2014-12-08 16:52:52 -05:00
Isaac Connor 27b9001eb4 default MoveRoot to empty to quiet an error in logs 2014-12-08 16:52:10 -05:00
Isaac Connor a52f07fa8e Some cleanups, remove code that does nothing. 
Instead of using ControlDevice to store the password, parse the ControlAddress to get username, password
enforce a port, which fixes the Digest Auth.
 2014-12-08 15:54:27 -05:00
Isaac Connor 5abc58ea14 Merge pull request #620 from SteveGilvarry/11-php-short-tags 
Replace PHP Short Open Tags - Fixes #11

Works for me too.
 2014-12-08 14:39:24 -05:00
Isaac Connor 2c1e4a9965 fix the paths so that the ptzControls are visible 2014-12-08 10:34:25 -05:00
Isaac Connor 6c9f93af63 Merge pull request #567 from knnniggett/zm_config_dir 
Add the ability to specify the zm configdir at build time.
 2014-12-08 10:01:17 -05:00
Andrew Bauer 1701764af4 Merge pull request #621 from manupap1/new_debian8_folder 
Add missing dependency to policykit-1
 2014-12-05 17:08:35 -06:00
Emmanuel Papin 94dce6729f Add missing dependency to policykit-1 2014-12-05 23:02:20 +01:00
SteveGilvarry e87e69fa57 Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
Andrew Bauer 882d85a9bc Merge pull request #614 from connortechnology/merge_flat_css_to_classic 
Merge flat css to classic
 2014-12-04 09:44:42 -06:00
Isaac Connor ba7230e7d7 Merge pull request #615 from knnniggett/rtsp 
Rtsp
 2014-12-04 09:49:20 -05:00
Andrew Bauer 97ee989a94 Parse multiple streams in RTP-Info 2014-12-02 19:33:05 -06:00
Andrew Bauer a6a779978a move seq and rtpTime declarations outside conditional 2014-12-01 17:21:49 -06:00
Andrew Bauer 0099b54248 Make lack of RTP-Info non-fatal 2014-12-01 17:15:08 -06:00
Andrew Bauer 4a248cc3aa add rtsp mediatype of application 2014-12-01 17:05:10 -06:00
Andrew Bauer 32e818e860 Check for RTSP timeout in PLAY command response 2014-12-01 16:58:42 -06:00
Isaac Connor f57f903aa6 Add views subdir 2014-12-01 16:10:01 -05:00
Isaac Connor af0d9a1065 bug fix for listing the css options. 
use SELECTED="SELECTED" instead of just SELECTED
 2014-12-01 15:58:00 -05:00
Isaac Connor fed12291be add flat to the subdirs 2014-12-01 15:57:44 -05:00
Isaac Connor 9f7d31949d remove the flat subdir 2014-12-01 15:55:22 -05:00
Isaac Connor 82c01479c6 move flat css files into the classic skin. 
remove autotools references to the flat skin, add the classic/flat css dirs
remove the flat skin
 2014-12-01 15:44:01 -05:00
Isaac Connor d7e08559d6 Merge pull request #582 from hanzese/patch-1 
Update et_ee.php
 2014-12-01 15:34:53 -05:00
Isaac Connor edf8338904 Merge pull request #602 from ZoneMinder/css_skins_for_classic 
Css skins for classic
 2014-12-01 11:27:43 -05:00
Isaac Connor 07695ce138 Merge pull request #605 from manupap1/new_debian8_folder 
New debian folder for jessie release
 2014-12-01 11:25:31 -05:00
Emmanuel Papin e0f8136b68 Remove warning insserv: warning: current start runlevel(s) of script 'zoneminder' overrides LSB defaults (empty). 2014-11-30 00:11:10 +01:00
Isaac Connor 02cdc37e3c Merge pull request #607 from manupap1/memory_fix_leaks 
Fix some memory leaks in zma
 2014-11-29 10:18:17 -05:00
Isaac Connor 51aa4e67ea Merge pull request #608 from knnniggett/RTSP_mUrl 
echo the URL to the RTSP device during the OPTIONS directive
 2014-11-29 10:14:26 -05:00
Andrew Bauer e4fa475d87 Merge pull request #588 from ZoneMinder/digest_auth 
Digest auth
 2014-11-29 08:32:08 -06:00
Andrew Bauer 1cff253dde echo the URL to the RTSP device during the OPTIONS directive 2014-11-29 08:13:06 -06:00
Emmanuel Papin 346015f472 Fix some indentations in zm_monitor.h 2014-11-29 14:39:57 +01:00
Emmanuel Papin c313e2e389 Fix a memory leak in Monitor::Analyse() 2014-11-29 06:06:10 +01:00
Kyle Johnson 8a79985f51 Merge pull request #606 from manupap1/memory_fix_mismatches 
Fix a mismatched free in zmc binary
 2014-11-28 21:51:47 -05:00
Emmanuel Papin 73b25a1de0 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_mismatches 2014-11-29 03:39:05 +01:00
Emmanuel Papin 41edb4d958 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_leaks 2014-11-29 03:38:45 +01:00
Emmanuel Papin 9a0e766e4c Revert commits to fix source-is-missing errors (does not work as expected) 2014-11-29 02:08:21 +01:00
Emmanuel Papin b8119a1e58 Files without sources shall be added in the debian/missing-sources folder 2014-11-29 01:48:38 +01:00
Emmanuel Papin 7ceec9979e Fix remaining lintian errors by adding files with missing sources to debian/missing-sources 2014-11-29 01:31:25 +01:00
Emmanuel Papin 950fc18e6a Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into new_debian8_folder 2014-11-28 23:25:15 +01:00
Kyle Johnson 7f585b8a44 Add sauce labs addon credentials to travis 2014-11-28 16:02:22 -05:00
Isaac Connor e6d47781d3 add Digest Authentication handling for simple http method. 2014-11-28 15:56:58 -05:00
Emmanuel Papin 578dcef4b8 Do not attempt to remove database if no mysql instance (fix a piuparts error) 2014-11-28 21:36:11 +01:00
Emmanuel Papin b0e3671f99 Fix a typo in debian/rules 2014-11-28 21:30:02 +01:00
Emmanuel Papin 2665eaeb88 First attempt to fix lintian warning debug-file-with-no-debug-symbols 2014-11-28 20:17:48 +01:00
Emmanuel Papin ad474e81a6 Remove lintian warning "possibly-insecure-handling-of-tmp-files-in-maintainer-script" 
This reverts commit 720f92a6bb.
 2014-11-28 19:37:42 +01:00
Emmanuel Papin d318a6f2eb Source init functions in init scrit (remove a lintian warning) 2014-11-28 19:33:36 +01:00
Emmanuel Papin 56234d7d2e Provide a dummy init file to fix a lintian error 2014-11-28 19:16:30 +01:00
Emmanuel Papin 720f92a6bb Delete remaining files and folders in postrm script 2014-11-28 18:32:36 +01:00