Commit 1d55ee80 authored by bmortier's avatar bmortier

Merge branch '1.0.18-fixes'

parents df4f925d 0428c0a1
FusionDirectory changelog
=========================
* FusionDirectory 1.0.19
[Fix] Bugs #5303: When clicking on login from user selection we end up in user edition
[Fix] Bugs #5314: after upgrading to 1.0.18 we see those errors
[Fix] Bugs #5317: The link sent by password recovery is broken
* FusionDirectory 1.0.18
[Fix] Bugs #4888: DNS record matching should be case insensitive
......
......@@ -2500,6 +2500,41 @@ Checking your indexed attributes
Check that all you index still match with valid attributes present in your ldap directory
Migrate FusionDirectory from 1.0.18 to 1.0.19
=============================================
Ubuntu 12.0.4 TLS users
=======================
Since 1.0.9.2 FusionDirectory need the php-cas library for CAS server support. This library can normally found in universe in the Ubuntu repositories
In case you did not find it, grab the deb from here and install it
http://packages.ubuntu.com/trusty/all/php-cas/download
and select your preferred mirror
Upgrade FusionDirectory first
=============================
- Upgrade FusionDirectory core package before other ones to avoid dependencies errors:
apt-get install fusiondirectory
- Upgrade FusionDirectory schema package too.
apt-get install fusiondirectory-schema
Upgrade of LDAP directory
=========================
No upgrade
Upgrade of LDAP directory
=========================
No Upgrade
Enjoy :)
---
......
......@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-INSERT-SCHEMA 1"
.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2017-01-13" "FusionDirectory 1.0.18" "FusionDirectory Documentation"
.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2017-01-19" "FusionDirectory 1.0.19" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
......
......@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-SETUP 1"
.TH FUSIONDIRECTORY-SETUP 1 "2017-01-14" "FusionDirectory 1.0.18" "FusionDirectory Documentation"
.TH FUSIONDIRECTORY-SETUP 1 "2017-01-19" "FusionDirectory 1.0.19" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
......
......@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY.CONF 1"
.TH FUSIONDIRECTORY.CONF 1 "2016-11-02" "FusionDirectory 1.0.18" "FusionDirectory Documentation"
.TH FUSIONDIRECTORY.CONF 1 "2016-11-02" "FusionDirectory 1.0.19" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
......
......@@ -554,7 +554,7 @@ class passwordRecovery extends standAlonePage {
}
$reinit_link = $this->getPageURL();
$reinit_link .= "?uniq=".urlencode($activatecode);
$reinit_link .= "?uniq=".urlencode($token);
$reinit_link .= "&uid=".urlencode($this->uid);
$reinit_link .= "&email_address=".urlencode($this->email_address);
......
......@@ -25,6 +25,9 @@
* for an example see Menu.prototype.config
*/
var Menu = Class.create();
var MenuContainer = Class.create();
var MenuItem = Class.create();
Menu.prototype = {
initialize: function(idOrElement, name, customConfigFunction) {
......@@ -50,7 +53,6 @@ Menu.prototype = {
}
var MenuContainer = Class.create();
MenuContainer.prototype = {
initialize: function(idOrElement, parent) {
this.type = "menuContainer";
......@@ -112,7 +114,7 @@ MenuContainer.prototype = {
}
},
getBorders: function(element) {
getBorders: function() {
var ltrb = ["Left","Top","Right","Bottom"];
var result = {};
var value;
......@@ -175,9 +177,6 @@ MenuContainer.prototype = {
}
var MenuItem = Class.create();
Object.extend(Object.extend(MenuItem.prototype, MenuContainer.prototype), {
initialize: function(idOrElement, parent) {
var menuItem = this;
......@@ -231,10 +230,8 @@ Object.extend(Object.extend(MenuItem.prototype, MenuContainer.prototype), {
}
});
var menu;
function configMenu() {
this.closeDelayTime = 300;
}
......@@ -243,5 +240,4 @@ function initMenu() {
menu = new Menu('root', 'menu', configMenu);
}
Event.observe(window, 'load', initMenu, false);
......@@ -63,7 +63,7 @@ define("FPDF_FONTPATH", "/usr/share/php/fpdf/font/"); /*! Define fpdf font path
/*!
* \brief FusionDirectory Version
*/
define ("FD_VERSION", "1.0.18"); /*! Define FusionDirectory version */
define ("FD_VERSION", "1.0.19"); /*! Define FusionDirectory version */
/*!
* \brief FusionDirectory config object RDN
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment