From f8e865bdcc6282706e069876596c7a526e6fb12c Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Mon, 24 Feb 2014 16:15:12 +0100 Subject: [PATCH 1/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bb9ffd949..2d0d016a2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## 3.8.3 (2014-xx-xx) + - BugFix : Fix record type editing. - BugFix : Fix scheduler timeout. - BugFix : Fix thesaurus tab javascript errors. - BugFix : Fix IE slow script error messages. From 1467dfbc3e3f92b8d03ba48a4727b51065657890 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Mon, 24 Feb 2014 16:16:22 +0100 Subject: [PATCH 2/3] Prepare version 3.8.3 --- bower.json | 2 +- lib/Alchemy/Phrasea/Core/Version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index f32f9c81ef..98c5af2178 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "Phraseanet", - "version": "3.8.2", + "version": "3.8.3", "dependencies": { "bootstrap": "~2.2.2", "jquery": "~1.8.3", diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index ff45b79586..b7d81c3beb 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -18,7 +18,7 @@ namespace Alchemy\Phrasea\Core; */ class Version { - protected static $number = '3.8.3-alpha.5'; + protected static $number = '3.8.3'; protected static $name = 'Diplodocus'; public static function getNumber() From ab7f567d62d54eba5e5421832afca8ae089c770c Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Mon, 24 Feb 2014 18:40:10 +0100 Subject: [PATCH 3/3] Bump to version 3.8.4-alpha.0 --- lib/Alchemy/Phrasea/Core/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index b7d81c3beb..574b34254a 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -18,7 +18,7 @@ namespace Alchemy\Phrasea\Core; */ class Version { - protected static $number = '3.8.3'; + protected static $number = '3.8.4-alpha.0'; protected static $name = 'Diplodocus'; public static function getNumber()