Showing with 8 additions and 8 deletions.
  1. +1 −1 app/lib/dal/sqliteDAL/IdentityDAL.js
  2. +1 −1 gui/index.html
  3. +1 −1 install.sh
  4. +2 −2 package.json
  5. +1 −1 release/arch/debian/package/DEBIAN/control
  6. +1 −1 release/arch/windows/duniter.iss
  7. +1 −1 test/integration/branches.js
@@ -115,7 +115,7 @@ function IdentityDAL(driver) {
uid: "%" + search + "%"
});

this.trimExpiredIdentities = (medianTime) => this.exec('DELETE FROM ' + this.table + ' WHERE expires_on IS NULL OR expires_on < ' + medianTime);
this.trimExpiredIdentities = (medianTime) => this.exec('DELETE FROM ' + this.table + ' WHERE (expires_on IS NULL AND revocation_sig IS NULL) OR expires_on < ' + medianTime);

/**************************
* SANDBOX STUFF
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>Duniter 1.3.11</title>
<title>Duniter 1.3.12</title>
<style>
html {
font-family: "Courier New", Courier, monospace;
@@ -11,7 +11,7 @@ if [ -z "$DUNITER_DIR" ]; then
fi

latest_version() {
echo "v1.3.11"
echo "v1.3.12"
}

repo_url() {
@@ -1,6 +1,6 @@
{
"name": "duniter",
"version": "1.3.11",
"version": "1.3.12",
"engines": {
"node": ">=4.2.0",
"npm": ">=2.11"
@@ -12,7 +12,7 @@
"node-main": "./bin/duniter",
"window": {
"icon": "duniter.png",
"title": "v1.3.11",
"title": "v1.3.12",
"width": 800,
"height": 800,
"min_width": 750,
@@ -1,5 +1,5 @@
Package: duniter
Version: 1.3.11
Version: 1.3.12
Section: misc
Priority: optional
Architecture: all
@@ -15,7 +15,7 @@
#error "Unable to find MyAppExe"
#endif

#define MyAppVerStr "v1.3.11"
#define MyAppVerStr "v1.3.12"

[Setup]
AppName={#MyAppName}
@@ -43,7 +43,7 @@ describe("Branches", () => co(function*() {
it('should have a 3 blocks fork window size', function() {
return expectAnswer(rp('http://127.0.0.1:7778/node/summary', { json: true }), function(res) {
res.should.have.property('duniter').property('software').equal('duniter');
res.should.have.property('duniter').property('version').equal('1.3.11');
res.should.have.property('duniter').property('version').equal('1.3.12');
res.should.have.property('duniter').property('forkWindowSize').equal(3);
});
});