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

4707 Commits

Author SHA1 Message Date
Emmanuel Papin cc4324ef37 Work on the debconf integration 2014-12-02 00:58:18 +01: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 c1125c991f Merge pull request #613 from SteveGilvarry/feature-h264-videostorage 
feature-h264-videostorage mp4 container
 2014-12-01 15:02:12 -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
SteveGilvarry b04099b96c Missed mkv in timeline.js 2014-12-01 21:55:43 +11:00
SteveGilvarry 2de8dae172 Make timeline open event.mp4 instead of mkv 2014-12-01 13:33:18 +11:00
Emmanuel Papin df8b625228 Add files for debconf support 2014-11-30 17:55:26 +01: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
Isaac Connor 617179b649 spaces to tabs, hide video stuff if video writer is turned off 2014-11-28 16:47:16 -05: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
Isaac Connor 69090563d5 Merge branch 'master' into video 
Conflicts:
	src/CMakeLists.txt
	src/zm_monitor.cpp
 2014-11-28 14:23:05 -05: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
Emmanuel Papin 8a9ad93b81 Enable apache CGI module in postinst script (not enabled in debian 8 by default) 2014-11-28 18:07:09 +01:00
Emmanuel Papin d8973d6cbd Configure apache in postrm script (code taken from phpmyadmin) 2014-11-28 17:46:37 +01:00
Emmanuel Papin bfb71952fd Add missing argument in postint script 2014-11-28 17:14:07 +01:00
Emmanuel Papin 6628f29fdc Configure apache in postinst script (code taken from phpmyadmin) 2014-11-28 16:45:05 +01:00
Emmanuel Papin d60131925f Fix a typo in debian/rules 2014-11-28 15:52:22 +01:00
Emmanuel Papin 5a36ab1923 Revert "Attempt to fix lintian error init.d-script-not-included-in-package" 
This reverts commit c1e98707c4.
 2014-11-28 15:38:45 +01:00
Emmanuel Papin b75bea3e16 Revert "Attempt to fix error init.d-script-not-included-in-packag" 
This reverts commit c84f1b644b.
 2014-11-28 15:37:35 +01:00
Emmanuel Papin c3a72892e6 Revert "Fist attempt to fix lintian error init.d-script-not-included-in-package" 
This reverts commit f9ae34ae1d.
 2014-11-28 15:36:06 +01:00