mirror of
https://github.com/postfixadmin/postfixadmin.git
synced 2026-11-20 23:43:26 +03:00
Merge remote-tracking branch 'svnexport/master'
This commit is contained in:
commit
bfcbb18a8b
4 files changed
+16
-8
No files matched your search
+2
-1
@@ -9,7 +9,7 @@
|
||||
# Last update:
|
||||
# $Id$
|
||||
|
||||
Version 3.0 beta3 (2.93) - 2015/09/** - SVN r****
|
||||
Version 3.0 beta3 (2.93) - 2015/09/26 - SVN r1802
|
||||
-------------------------------------------------
|
||||
|
||||
Summary of major changes:
|
||||
@@ -116,6 +116,7 @@ Version 3.0 beta3 (2.93) - 2015/09/** - SVN r****
|
||||
- setup.php: stop relying on subversion keyword for database upgrades
|
||||
- explictly set session_cache_limiter to nocache (bug#347)
|
||||
- fetchmail.pl: honor the (newly added) active column
|
||||
- change fetchmail.date field to date (no auto-update) (bug#351)
|
||||
- several small changes and fixes at various places - too many to list them here
|
||||
|
||||
Version 3.0 beta2 (2.92) - 2014/10/28 - SVN r1706
|
||||
|
||||
Vendored
+7
@@ -1,3 +1,10 @@
|
||||
postfixadmin (2.93-1) unstable; urgency=low
|
||||
|
||||
* New upstream release (effectively beta3 for v3.0)
|
||||
* update dependencies to allow mariadb as database
|
||||
|
||||
-- David Goodwin <david@palepurple.co.uk> Sat, 26 Sep 2015 15:05:00 +0100
|
||||
|
||||
postfixadmin (2.92-1) unstable; urgency=low
|
||||
|
||||
* New upstream release (effectively beta2 for v3.0)
|
||||
|
||||
Vendored
+6
-6
@@ -5,9 +5,9 @@ Last-Update: 2012-05-28
|
||||
|
||||
Index: postfixadmin/config.inc.php
|
||||
===================================================================
|
||||
--- postfixadmin.orig/config.inc.php 2011-12-18 05:22:05.000000000 +0100
|
||||
+++ postfixadmin/config.inc.php 2011-12-18 05:31:16.000000000 +0100
|
||||
@@ -16,6 +16,11 @@
|
||||
--- postfixadmin.orig/config.inc.php 2015-09-26 15:03:05.000000000 +0100
|
||||
+++ postfixadmin/config.inc.php 2015-09-26 15:03:16.000000000 +0100
|
||||
@@ -15,6 +15,11 @@
|
||||
* Contains configuration options.
|
||||
*/
|
||||
|
||||
@@ -19,7 +19,7 @@ Index: postfixadmin/config.inc.php
|
||||
/*****************************************************************
|
||||
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
||||
* You have to set $CONF['configured'] = true; before the
|
||||
@@ -23,7 +28,7 @@
|
||||
@@ -22,7 +27,7 @@
|
||||
* Doing this implies you have changed this file as required.
|
||||
* i.e. configuring database etc; specifying setup.php password etc.
|
||||
*/
|
||||
@@ -28,9 +28,9 @@ Index: postfixadmin/config.inc.php
|
||||
|
||||
// In order to setup Postfixadmin, you MUST specify a hashed password here.
|
||||
// To create the hash, visit setup.php in a browser and type a password into the field,
|
||||
@@ -85,11 +90,11 @@
|
||||
@@ -80,11 +85,11 @@
|
||||
// mysql = MySQL 3.23 and 4.0, 4.1 or 5
|
||||
// mysqli = MySQL 4.1+
|
||||
// mysqli = MySQL 4.1+ or MariaDB
|
||||
// pgsql = PostgreSQL
|
||||
-$CONF['database_type'] = 'mysqli';
|
||||
-$CONF['database_host'] = 'localhost';
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
* Contains re-usable code.
|
||||
*/
|
||||
|
||||
$version = '2.92';
|
||||
$version = '2.93';
|
||||
|
||||
/**
|
||||
* check_session
|
||||
|
||||
Reference in new issue
Block a user