Commit Graph

4040 Commits

Author SHA1 Message Date
Emmanuel Papin f2168f50d1 Fix permissions on /etc/zm/zm.conf as requested by the debian policy 2014-12-07 11:51:08 +01:00
Emmanuel Papin aab181ffa6 Fix some comments in postinst script 2014-12-07 02:43:08 +01:00
Emmanuel Papin 31fda1fc7c Bring localization to debconf menus and add french language 2014-12-07 02:38:00 +01:00
Emmanuel Papin 9d4c08ff45 Add version to build dependency on po-debconf 2014-12-07 01:51:36 +01:00
Emmanuel Papin af0770c33f Use 'true' to prevent config script from dying and fix a bad variable name 2014-12-07 00:04:26 +01:00
Emmanuel Papin b201ad2d7e Do not do some actions when upgrading 2014-12-06 21:39:50 +01:00
Emmanuel Papin 328ccc1bc6 Update the database version after dbconfig upgrade 2014-12-06 21:15:04 +01:00
Emmanuel Papin 6c0854f16f Fix bad setting of admin account 2014-12-06 18:48:09 +01:00
Emmanuel Papin 700aca0769 Merge branch 'debconf_support3' into debconf_support 2014-12-06 18:11:37 +01:00
Emmanuel Papin 8def8a7b94 Re-work of debconf dbconfig integration 2014-12-06 17:50:13 +01:00
Emmanuel Papin 0e1b0f8c06 Readd dependency to debconf and dbconfig-common 2014-12-06 14:10:44 +01:00
Emmanuel Papin 8ab1237d43 Fix confict when merging from master 2014-12-06 14:09:59 +01:00
Emmanuel Papin 01e57dbbe9 Readd dependency to debconf and dbconfig-common 2014-12-06 14:05:16 +01:00
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
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