Merge branch 'master' into mam
This commit is contained in:
commit
ae58e3d1be
@ -5858,7 +5858,8 @@
|
|||||||
} catch (e) {
|
} catch (e) {
|
||||||
converse.log("Could not restore sessions. Error message: "+e.message);
|
converse.log("Could not restore sessions. Error message: "+e.message);
|
||||||
}
|
}
|
||||||
} else if (this.auto_login) {
|
}
|
||||||
|
if (this.auto_login) {
|
||||||
if (!this.jid) {
|
if (!this.jid) {
|
||||||
throw new Error("initConnection: If you use auto_login, you also need to provide a jid value");
|
throw new Error("initConnection: If you use auto_login, you also need to provide a jid value");
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,11 @@
|
|||||||
Changelog
|
Changelog
|
||||||
=========
|
=========
|
||||||
|
|
||||||
|
0.9.5 (Unreleased)
|
||||||
|
------------------
|
||||||
|
|
||||||
|
* #439 auto_login and keepalive not working [jcbrand]
|
||||||
|
|
||||||
0.9.4 (2015-07-04)
|
0.9.4 (2015-07-04)
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user