From fb24d85e702b9371b42c2f81802d264d8402c6e1 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 25 Apr 2012 23:54:10 +0200 Subject: [PATCH 1/3] Fix Phraseanet version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 29b5712620..facbcebe85 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Phraseanet 3.5 - Digital Asset Management application +Phraseanet 3.6 - Digital Asset Management application ================================================= #Features : From bf97f5ce496e963fc0302b5fb19d85aff6dd4b68 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 25 Apr 2012 23:54:29 +0200 Subject: [PATCH 2/3] Bump to version 3.6.3 --- 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 9769686318..6feaa75cd3 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -20,7 +20,7 @@ namespace Alchemy\Phrasea\Core; class Version { - protected static $number = '3.6.2'; + protected static $number = '3.6.3'; protected static $name = 'Brachiosaure'; public static function getNumber() From 2c83c77d9a3afb5847f045877df4fe73227e0f0f Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 27 Apr 2012 18:39:42 +0200 Subject: [PATCH 3/3] Fix date Search / Selection / Default sort --- lib/classes/searchEngine/options.class.php | 2 +- www/prod/page0.js | 1 + www/skins/common/main.css | 8 -------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/classes/searchEngine/options.class.php b/lib/classes/searchEngine/options.class.php index 78c179d7f9..4b201f3bc1 100644 --- a/lib/classes/searchEngine/options.class.php +++ b/lib/classes/searchEngine/options.class.php @@ -98,7 +98,7 @@ class searchEngine_options implements Serializable * * @var string */ - protected $sort_by = self::SORT_CREATED_ON; + protected $sort_by; /** * diff --git a/www/prod/page0.js b/www/prod/page0.js index c829783943..84c7c08820 100644 --- a/www/prod/page0.js +++ b/www/prod/page0.js @@ -1116,6 +1116,7 @@ $(document).ready(function(){ $('.datepicker').datepicker({ changeYear: true, changeMonth:true, + dateFormat:'yy/mm/dd', showOn: 'button', buttonImage:'/skins/icons/cal.png', buttonImageOnly: true diff --git a/www/skins/common/main.css b/www/skins/common/main.css index 48862cce60..26f66652db 100644 --- a/www/skins/common/main.css +++ b/www/skins/common/main.css @@ -1,11 +1,3 @@ -html, body, *{ - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} body{ margin:0;