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

4230 Commits

Author SHA1 Message Date
Emmanuel Papin 65bd73b102 Fix conflict when merging from master 2014-12-06 14:03:24 +01:00
Emmanuel Papin 70707d6346 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debconf_support3 2014-12-06 13:54:14 +01: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
Emmanuel Papin 42a460ae6e Add missing dependency to policykit-1 2014-12-05 22:55:47 +01:00
Emmanuel Papin 9cf50cbca4 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into debconf_support 2014-12-05 22:51:40 +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
Emmanuel Papin 441b6631e3 Get a chance to enter config 2014-12-03 23:21:41 +01:00
Emmanuel Papin e5a986376e Remove unneeded call to db_purge in postrm script and source the debconf file where it is required 2014-12-03 22:52:10 +01:00
Emmanuel Papin e0e00e7a64 Add some double quote to string for proper coding 2014-12-03 20:30:33 +01:00
Emmanuel Papin 400e656f52 Adjust a debconf message 2014-12-03 20:27:42 +01:00
Emmanuel Papin bdc2b383de Fix exit codes in zoneminder.config 2014-12-03 18:22:19 +01:00
Emmanuel Papin da3467aa77 Remove a potential remaining file when purging and rework of apache deconfiguration 2014-12-03 17:43:39 +01:00
Emmanuel Papin 805933b501 Re-add missing argument to apache_install function 2014-12-03 17:27:27 +01:00
Emmanuel Papin 6c417e02e4 Only link files with zm_update-*.sql pattern 2014-12-03 16:42:31 +01:00
Emmanuel Papin 0f53347133 Fix package name for directory creation 2014-12-03 16:19:42 +01:00
Emmanuel Papin ae4e13a9c6 Remove some trailing whitespaces 2014-12-03 16:02:39 +01:00
Emmanuel Papin 1e805ca706 Add dependency to debconf and dbconfig-common 2014-12-03 16:01:31 +01:00
Emmanuel Papin b164f7953d Create the directories in dbconfig folder 2014-12-03 15:40:13 +01:00
Emmanuel Papin 8a51a754aa Install the sql files for dbconfig 2014-12-03 15:38:31 +01:00
Emmanuel Papin 9eb21bc3dd Fix exit code in debian scripts and remove manual database deletion in postrm script 2014-12-03 14:12:26 +01:00
Emmanuel Papin 7cb62cd3a0 Set debug mode 2014-12-03 13:40:30 +01:00
Andrew Bauer 97ee989a94 Parse multiple streams in RTP-Info 2014-12-02 19:33:05 -06:00
Emmanuel Papin 99c4bce7e2 Merge branch 'master' of https://github.com/manupap1/ZoneMinder into new_debian8_folder_with_debconf 2014-12-02 01:01:47 +01:00
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 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 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