From 086f0e739b63533c0a55e030353e8bf90c7bef41 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Mon, 2 Sep 2013 17:29:33 +0200 Subject: [PATCH 01/11] Fix #1431 Js binding issue with disabled link --- templates/web/admin/tasks/list.html.twig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/web/admin/tasks/list.html.twig b/templates/web/admin/tasks/list.html.twig index 0d71ca621f..059249621c 100644 --- a/templates/web/admin/tasks/list.html.twig +++ b/templates/web/admin/tasks/list.html.twig @@ -262,6 +262,10 @@ $(".taskMenuItem").bind("click", function() { + if ($(this).hasClass('disabled')) { + return false; + } + var action = $(this).attr("id").split('_'); switch(action[0]) From 66bcf32d81e00284b9d2e439476ffa8cfc1a3a14 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Tue, 3 Sep 2013 17:22:18 +0200 Subject: [PATCH 02/11] Fix #1419 Fix resize issue on mobile view --- templates/mobile/common/index.html.twig | 25 +++++++++++++++++++ templates/mobile/common/thumbnail.html.twig | 20 +++++---------- .../mobile/lightbox/basket_element.html.twig | 11 +++++--- .../mobile/lightbox/feed_element.html.twig | 10 ++++++-- templates/mobile/lightbox/index.html.twig | 6 ++--- 5 files changed, 50 insertions(+), 22 deletions(-) diff --git a/templates/mobile/common/index.html.twig b/templates/mobile/common/index.html.twig index e1dd51535b..cadf1051c3 100644 --- a/templates/mobile/common/index.html.twig +++ b/templates/mobile/common/index.html.twig @@ -8,6 +8,31 @@ + {% block stylesheet %}{% endblock %} {% block icon %}{% endblock %} {% block javascript %}{% endblock %} diff --git a/templates/mobile/common/thumbnail.html.twig b/templates/mobile/common/thumbnail.html.twig index 34ba286549..b8d676b229 100644 --- a/templates/mobile/common/thumbnail.html.twig +++ b/templates/mobile/common/thumbnail.html.twig @@ -71,12 +71,12 @@ {% endmacro %} {% macro format100percent(thumbnail, extraclass)%} - {% set record_type = thumbnail.get_type() %} -
+ {% set record_type = thumbnail.get_type() %} +
{% if record_type == 'VIDEO_MP4' or record_type == 'VIDEO_FLV' %} {% set random = thumbnail.get_random() %} -
-
- - +
{% endmacro %} diff --git a/templates/mobile/lightbox/basket_element.html.twig b/templates/mobile/lightbox/basket_element.html.twig index 2431c258c4..ddfb3aac0d 100644 --- a/templates/mobile/lightbox/basket_element.html.twig +++ b/templates/mobile/lightbox/basket_element.html.twig @@ -7,7 +7,7 @@ {% endblock %} {% block stylesheet %} - + {% endblock %} {% block content %} @@ -19,13 +19,12 @@ Home
- {{ thumbnail.format100percent(record.get_preview(),'', record.get_thumbnail()) }} + {{ thumbnail.format100percent(record.get_preview()) }} {% if basket_element.getBasket().getValidation() %} {% if basket_element.getBasket().getValidation().getParticipant(app['authentication'].getUser(), app).getCanAgree() %}
-
@@ -45,5 +44,11 @@
+
{% endblock %} diff --git a/templates/mobile/lightbox/feed_element.html.twig b/templates/mobile/lightbox/feed_element.html.twig index 66006c3a6f..3ae130a7c4 100644 --- a/templates/mobile/lightbox/feed_element.html.twig +++ b/templates/mobile/lightbox/feed_element.html.twig @@ -7,7 +7,7 @@ {% endblock %} {% block stylesheet %} - + {% endblock %} {% block content %} @@ -19,10 +19,16 @@ Home
- {{ thumbnail.format100percent(record.get_preview(),'', record.get_thumbnail()) }} + {{ thumbnail.format100percent(record.get_preview()) }}
+ {% endblock %} diff --git a/templates/mobile/lightbox/index.html.twig b/templates/mobile/lightbox/index.html.twig index 0960f6b65b..435b4d8464 100644 --- a/templates/mobile/lightbox/index.html.twig +++ b/templates/mobile/lightbox/index.html.twig @@ -39,7 +39,7 @@ {% trans 'a propos'%}
-
    +
    • {% trans 'Validations'%} {{_self.valid_baskets_length(baskets_collection)}} @@ -86,7 +86,7 @@

      {% trans 'Voici vos validations en cours' %}

      -
        +
          {% for basket in baskets_collection %} {% if basket.getValidation() %} {% set basket_length = basket.getElements().count() %} @@ -115,7 +115,7 @@

          {% trans 'Voici vos paniers' %}

          -
            +
              {% for basket in baskets_collection %} {% if basket.getValidation() is empty %} {% set basket_length = basket.getElements().count() %} From 41bbd13f7d5fb3da003ae2db22537a38e9b470f6 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Tue, 3 Sep 2013 18:03:43 +0200 Subject: [PATCH 03/11] Fix #1432 User settings for notifications are not saved in --- lib/Alchemy/Phrasea/Controller/Root/Account.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Alchemy/Phrasea/Controller/Root/Account.php b/lib/Alchemy/Phrasea/Controller/Root/Account.php index 5a3ff52d31..dd2eba9d1c 100644 --- a/lib/Alchemy/Phrasea/Controller/Root/Account.php +++ b/lib/Alchemy/Phrasea/Controller/Root/Account.php @@ -425,7 +425,7 @@ class Account implements ControllerProviderInterface foreach ($app['events-manager']->list_notifications_available($app['authentication']->getUser()->get_id()) as $notifications) { foreach ($notifications as $notification) { $notifId = $notification['id']; - $notifName = sprintf('notification_%d', $notifId); + $notifName = sprintf('notification_%s', $notifId); if (isset($requestedNotifications[$notifId])) { $app['authentication']->getUser()->setPrefs($notifName, '1'); From 629afb93ffe1e9b2c8b11a41fe9fe6cf4d48e28e Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Mon, 2 Sep 2013 12:24:33 +0200 Subject: [PATCH 04/11] Update dependencies, fix imagine transparency issue --- composer.lock | 551 +++++++++++++++++++++++++------------------------- 1 file changed, 277 insertions(+), 274 deletions(-) diff --git a/composer.lock b/composer.lock index b5d62eb451..6e4f0628b3 100644 --- a/composer.lock +++ b/composer.lock @@ -11,23 +11,23 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/BinaryDriver.git", - "reference": "1.5.0" + "reference": "b32c03d4b56ce29f783051eac55887adae654b41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/BinaryDriver/zipball/1.5.0", - "reference": "1.5.0", + "url": "https://api.github.com/repos/alchemy-fr/BinaryDriver/zipball/b32c03d4b56ce29f783051eac55887adae654b41", + "reference": "b32c03d4b56ce29f783051eac55887adae654b41", "shasum": "" }, "require": { - "evenement/evenement": ">=1.0,<2.0", - "monolog/monolog": ">=1.3,<2.0", + "evenement/evenement": "~1.0", + "monolog/monolog": "~1.3", "php": ">=5.3.3", - "psr/log": ">=1.0,<2.0", - "symfony/process": ">=2.0,<3.0" + "psr/log": "~1.0", + "symfony/process": "~2.0" }, "require-dev": { - "phpunit/phpunit": ">=3.7,<4.0" + "phpunit/phpunit": "~3.7" }, "type": "library", "autoload": { @@ -46,7 +46,7 @@ "homepage": "http://www.lickmychip.com/" }, { - "name": "nlegoff", + "name": "Nicolas Le Goff", "email": "legoff.n@gmail.com" }, { @@ -68,12 +68,12 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/GeonamesServer-PHP-Plugin.git", - "reference": "0.1.1" + "reference": "c01f5d2d132e215524860c336693ed043a94118f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/GeonamesServer-PHP-Plugin/zipball/0.1.1", - "reference": "0.1.1", + "url": "https://api.github.com/repos/alchemy-fr/GeonamesServer-PHP-Plugin/zipball/c01f5d2d132e215524860c336693ed043a94118f", + "reference": "c01f5d2d132e215524860c336693ed043a94118f", "shasum": "" }, "require": { @@ -106,22 +106,22 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/Ghostscript-PHP.git", - "reference": "0.4.0" + "reference": "a5d40c29efa4c4e4016a1f83cd5645300ad602d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/Ghostscript-PHP/zipball/0.4.0", - "reference": "0.4.0", + "url": "https://api.github.com/repos/alchemy-fr/Ghostscript-PHP/zipball/a5d40c29efa4c4e4016a1f83cd5645300ad602d7", + "reference": "a5d40c29efa4c4e4016a1f83cd5645300ad602d7", "shasum": "" }, "require": { - "alchemy/binary-driver": ">=1.5,<2.0", + "alchemy/binary-driver": "~1.5", "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": ">=3.7,<4.0", - "sami/sami": ">=1.0,<2.0", - "silex/silex": ">=1.0,<2.0" + "phpunit/phpunit": "~3.7", + "sami/sami": "~1.0", + "silex/silex": "~1.0" }, "type": "library", "autoload": { @@ -158,12 +158,12 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/google-plus-api-client.git", - "reference": "0.6.5" + "reference": "54dd23b7b5a3e78db9182acbe46c773fd5020a40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/google-plus-api-client/zipball/0.6.5", - "reference": "0.6.5", + "url": "https://api.github.com/repos/alchemy-fr/google-plus-api-client/zipball/54dd23b7b5a3e78db9182acbe46c773fd5020a40", + "reference": "54dd23b7b5a3e78db9182acbe46c773fd5020a40", "shasum": "" }, "require": { @@ -196,12 +196,12 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/oauth2-php.git", - "reference": "1.0.0" + "reference": "cb4fcb73e30ab54e0fb85a65b4d57147f7a0df15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/oauth2-php/zipball/1.0.0", - "reference": "1.0.0", + "url": "https://api.github.com/repos/alchemy-fr/oauth2-php/zipball/cb4fcb73e30ab54e0fb85a65b4d57147f7a0df15", + "reference": "cb4fcb73e30ab54e0fb85a65b4d57147f7a0df15", "shasum": "" }, "type": "library", @@ -219,12 +219,12 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/Phlickr.git", - "reference": "0.2.7" + "reference": "9f228cabf924bdd5913fdb59514904d0d4c8e40a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/Phlickr/zipball/0.2.7", - "reference": "0.2.7", + "url": "https://api.github.com/repos/alchemy-fr/Phlickr/zipball/9f228cabf924bdd5913fdb59514904d0d4c8e40a", + "reference": "9f228cabf924bdd5913fdb59514904d0d4c8e40a", "shasum": "" }, "type": "library", @@ -242,12 +242,12 @@ "source": { "type": "git", "url": "https://github.com/dailymotion/dailymotion-sdk-php.git", - "reference": "1.5.1" + "reference": "00c2a539874ada11fe0f2c7c9bbc42a56e7b53cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dailymotion/dailymotion-sdk-php/zipball/1.5.1", - "reference": "1.5.1", + "url": "https://api.github.com/repos/dailymotion/dailymotion-sdk-php/zipball/00c2a539874ada11fe0f2c7c9bbc42a56e7b53cf", + "reference": "00c2a539874ada11fe0f2c7c9bbc42a56e7b53cf", "shasum": "" }, "type": "library", @@ -274,18 +274,18 @@ "version": "0.1.0", "source": { "type": "git", - "url": "git://github.com/alchemy-fr/PHP-dataURI.git", - "reference": "0.1.0" + "url": "https://github.com/alchemy-fr/PHP-dataURI.git", + "reference": "4aa0ab6946455aaaf0c96250b76a1034150f9850" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/PHP-dataURI/zipball/0.1.0", - "reference": "0.1.0", + "url": "https://api.github.com/repos/alchemy-fr/PHP-dataURI/zipball/4aa0ab6946455aaaf0c96250b76a1034150f9850", + "reference": "4aa0ab6946455aaaf0c96250b76a1034150f9850", "shasum": "" }, "require": { "php": ">=5.3.2", - "symfony/http-foundation": ">=2.0,<3.0" + "symfony/http-foundation": "~2.0" }, "require-dev": { "sami/sami": "dev-master" @@ -320,12 +320,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "v1.1.2" + "reference": "40db0c96985aab2822edbc4848b3bd2429e02670" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/v1.1.2", - "reference": "v1.1.2", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/40db0c96985aab2822edbc4848b3bd2429e02670", + "reference": "40db0c96985aab2822edbc4848b3bd2429e02670", "shasum": "" }, "require": { @@ -391,12 +391,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "v1.0" + "reference": "914abe4a49f2eae2b268073cca147b530da0308a" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/cache/archive/v1.0.zip", - "reference": "v1.0", + "url": "https://api.github.com/repos/doctrine/cache/zipball/914abe4a49f2eae2b268073cca147b530da0308a", + "reference": "914abe4a49f2eae2b268073cca147b530da0308a", "shasum": "" }, "require": { @@ -452,12 +452,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "v1.1" + "reference": "560f29c39cfcfbcd210e5d549d993a39d898b04b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/v1.1", - "reference": "v1.1", + "url": "https://api.github.com/repos/doctrine/collections/zipball/560f29c39cfcfbcd210e5d549d993a39d898b04b", + "reference": "560f29c39cfcfbcd210e5d549d993a39d898b04b", "shasum": "" }, "require": { @@ -518,13 +518,13 @@ "version": "2.3.0", "source": { "type": "git", - "url": "https://github.com/doctrine/common", - "reference": "2.3.0" + "url": "https://github.com/doctrine/common.git", + "reference": "d1c7d4334e38cad603a5c863d4c7b91bb04ec6b2" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/common/zipball/2.3.0", - "reference": "2.3.0", + "url": "https://api.github.com/repos/doctrine/common/zipball/d1c7d4334e38cad603a5c863d4c7b91bb04ec6b2", + "reference": "d1c7d4334e38cad603a5c863d4c7b91bb04ec6b2", "shasum": "" }, "require": { @@ -580,7 +580,7 @@ "persistence", "spl" ], - "time": "2012-09-19 22:55:18" + "time": "2012-09-20 05:55:18" }, { "name": "doctrine/dbal", @@ -588,12 +588,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "2.3.4" + "reference": "2a37b007dda8e21bdbb8fa445be8fa0064199e13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/2.3.4", - "reference": "2.3.4", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/2a37b007dda8e21bdbb8fa445be8fa0064199e13", + "reference": "2a37b007dda8e21bdbb8fa445be8fa0064199e13", "shasum": "" }, "require": { @@ -651,12 +651,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/lexer.git", - "reference": "v1.0" + "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb" }, "dist": { "type": "zip", - "url": "https://github.com/doctrine/lexer/archive/v1.0.zip", - "reference": "v1.0", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/2f708a85bb3aab5d99dab8be435abd73e0b18acb", + "reference": "2f708a85bb3aab5d99dab8be435abd73e0b18acb", "shasum": "" }, "require": { @@ -703,12 +703,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/doctrine2.git", - "reference": "2.3.4" + "reference": "a41b02c080114c0de3da4ee9fba61f7d18fae7d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/2.3.4", - "reference": "2.3.4", + "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/a41b02c080114c0de3da4ee9fba61f7d18fae7d0", + "reference": "a41b02c080114c0de3da4ee9fba61f7d18fae7d0", "shasum": "" }, "require": { @@ -813,12 +813,12 @@ "source": { "type": "git", "url": "https://github.com/facebook/facebook-php-sdk.git", - "reference": "v3.2.2" + "reference": "bf99924386be074da30a8e9d6bbcb49d3333da12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facebook/facebook-php-sdk/zipball/v3.2.2", - "reference": "v3.2.2", + "url": "https://api.github.com/repos/facebook/facebook-php-sdk/zipball/bf99924386be074da30a8e9d6bbcb49d3333da12", + "reference": "bf99924386be074da30a8e9d6bbcb49d3333da12", "shasum": "" }, "require": { @@ -852,16 +852,16 @@ }, { "name": "gedmo/doctrine-extensions", - "version": "v2.3.6", + "version": "v2.3.7", "source": { "type": "git", "url": "https://github.com/l3pp4rd/DoctrineExtensions.git", - "reference": "v2.3.6" + "reference": "0aa660ffea298b630b8ded7bd2a7eae0d8619fdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/l3pp4rd/DoctrineExtensions/zipball/v2.3.6", - "reference": "v2.3.6", + "url": "https://api.github.com/repos/l3pp4rd/DoctrineExtensions/zipball/0aa660ffea298b630b8ded7bd2a7eae0d8619fdb", + "reference": "0aa660ffea298b630b8ded7bd2a7eae0d8619fdb", "shasum": "" }, "require": { @@ -869,12 +869,12 @@ "php": ">=5.3.2" }, "require-dev": { - "doctrine/common": ">=2.4.0-BETA2", - "doctrine/dbal": ">=2.4.0-BETA2", - "doctrine/mongodb": ">=1.0.2", - "doctrine/mongodb-odm": ">=1.0.0-BETA8", - "doctrine/orm": ">=2.4.0-BETA2", - "symfony/yaml": "2.*" + "doctrine/common": ">=2.4.0-RC3", + "doctrine/dbal": ">=2.4.0-RC1", + "doctrine/mongodb": ">=1.0.3", + "doctrine/mongodb-odm": ">=1.0.0-BETA9", + "doctrine/orm": ">=2.4.0-RC1", + "symfony/yaml": "2.3.1" }, "suggest": { "doctrine/dbal": ">=2.3.2", @@ -890,7 +890,7 @@ }, "autoload": { "psr-0": { - "Gedmo": "lib/" + "Gedmo\\": "lib/" } }, "notification-url": "https://packagist.org/downloads/", @@ -928,20 +928,20 @@ "tree", "uploadable" ], - "time": "2013-05-21 12:09:55" + "time": "2013-08-18 07:18:44" }, { "name": "guzzle/guzzle", - "version": "v3.6.0", + "version": "v3.7.2", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "v3.6.0" + "reference": "eaef90d27bb1d682e1f6ab2d77606dc0159049e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/v3.6.0", - "reference": "v3.6.0", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/eaef90d27bb1d682e1f6ab2d77606dc0159049e6", + "reference": "eaef90d27bb1d682e1f6ab2d77606dc0159049e6", "shasum": "" }, "require": { @@ -985,7 +985,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.6-dev" + "dev-master": "3.7-dev" } }, "autoload": { @@ -1020,7 +1020,7 @@ "rest", "web service" ], - "time": "2013-05-30 07:01:25" + "time": "2013-08-02 18:31:05" }, { "name": "imagine/imagine", @@ -1028,12 +1028,12 @@ "source": { "type": "git", "url": "https://github.com/avalanche123/Imagine.git", - "reference": "0af397b3b96aac5b11593ca9136ca43a55869c5f" + "reference": "0a3cb3c7a6839f7f29fbff9fb76e31700a2692e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/0af397b3b96aac5b11593ca9136ca43a55869c5f", - "reference": "0af397b3b96aac5b11593ca9136ca43a55869c5f", + "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/0a3cb3c7a6839f7f29fbff9fb76e31700a2692e2", + "reference": "0a3cb3c7a6839f7f29fbff9fb76e31700a2692e2", "shasum": "" }, "require": { @@ -1077,32 +1077,32 @@ "image manipulation", "image processing" ], - "time": "2013-07-19 16:16:00" + "time": "2013-08-30 12:28:56" }, { "name": "jms/metadata", - "version": "1.3.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/schmittjoh/metadata.git", - "reference": "1.3.0" + "reference": "0af8423dc23dfeed1592426106d2ffbc69f68057" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/1.3.0", - "reference": "1.3.0", + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/0af8423dc23dfeed1592426106d2ffbc69f68057", + "reference": "0af8423dc23dfeed1592426106d2ffbc69f68057", "shasum": "" }, "require": { "php": ">=5.3.0" }, "require-dev": { - "doctrine/common": ">=2.0,<2.4-dev" + "doctrine/cache": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.3.x-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { @@ -1129,20 +1129,20 @@ "xml", "yaml" ], - "time": "2013-01-22 12:51:18" + "time": "2013-08-27 18:10:33" }, { "name": "jms/parser-lib", "version": "1.0.0", "source": { "type": "git", - "url": "git://github.com/schmittjoh/parser-lib", - "reference": "1.0.0" + "url": "https://github.com/schmittjoh/parser-lib.git", + "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d" }, "dist": { "type": "zip", - "url": "https://github.com/schmittjoh/parser-lib/archive/1.0.0.zip", - "reference": "1.0.0", + "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d", + "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d", "shasum": "" }, "require": { @@ -1168,21 +1168,21 @@ }, { "name": "jms/serializer", - "version": "0.12.0", + "version": "0.13.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/serializer.git", - "reference": "0.12.0" + "reference": "9e0fcd00a374e9ad484687628c6c25ab1083ea5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/0.12.0", - "reference": "0.12.0", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/9e0fcd00a374e9ad484687628c6c25ab1083ea5a", + "reference": "9e0fcd00a374e9ad484687628c6c25ab1083ea5a", "shasum": "" }, "require": { "doctrine/annotations": "1.*", - "jms/metadata": ">=1.1,<2.0", + "jms/metadata": "~1.1", "jms/parser-lib": "1.*", "php": ">=5.3.2", "phpcollection/phpcollection": ">=0.1,<0.3-dev" @@ -1202,7 +1202,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.12-dev" + "dev-master": "0.13-dev" } }, "autoload": { @@ -1231,7 +1231,7 @@ "serialization", "xml" ], - "time": "2013-03-28 16:41:24" + "time": "2013-07-29 13:39:49" }, { "name": "justinrainbow/json-schema", @@ -1239,12 +1239,12 @@ "source": { "type": "git", "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "1.3.3" + "reference": "56fe099669ff3ec3be859ec02e3da965a720184d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/1.3.3", - "reference": "1.3.3", + "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/56fe099669ff3ec3be859ec02e3da965a720184d", + "reference": "56fe099669ff3ec3be859ec02e3da965a720184d", "shasum": "" }, "require": { @@ -1306,12 +1306,12 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/Media-Alchemyst.git", - "reference": "0.3.4" + "reference": "3d10c9d3fde4c6e77434b883ed14f08e60b0734b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/0.3.4", - "reference": "0.3.4", + "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/3d10c9d3fde4c6e77434b883ed14f08e60b0734b", + "reference": "3d10c9d3fde4c6e77434b883ed14f08e60b0734b", "shasum": "" }, "require": { @@ -1379,12 +1379,12 @@ "source": { "type": "git", "url": "https://github.com/romainneutron/MediaVorus.git", - "reference": "0.4.0" + "reference": "0102f4e73f9184ff7861f89b6c1189a83fb19bac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/romainneutron/MediaVorus/zipball/0.4.0", - "reference": "0.4.0", + "url": "https://api.github.com/repos/romainneutron/MediaVorus/zipball/0102f4e73f9184ff7861f89b6c1189a83fb19bac", + "reference": "0102f4e73f9184ff7861f89b6c1189a83fb19bac", "shasum": "" }, "require": { @@ -1502,12 +1502,12 @@ "source": { "type": "git", "url": "https://github.com/mrclay/minify.git", - "reference": "2.1.7" + "reference": "db7fe244932ea77cf1438965693672ea12b33da8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mrclay/minify/zipball/2.1.7", - "reference": "2.1.7", + "url": "https://api.github.com/repos/mrclay/minify/zipball/db7fe244932ea77cf1438965693672ea12b33da8", + "reference": "db7fe244932ea77cf1438965693672ea12b33da8", "shasum": "" }, "require": { @@ -1541,21 +1541,21 @@ "version": "0.1.3", "source": { "type": "git", - "url": "https://github.com/romainneutron/ReCaptcha", - "reference": "0.1.3" + "url": "https://github.com/romainneutron/ReCaptcha.git", + "reference": "f9de705c5b8631ec74353bb9f0b5077d50328ab2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/romainneutron/ReCaptcha/zipball/0.1.3", - "reference": "0.1.3", + "url": "https://api.github.com/repos/romainneutron/ReCaptcha/zipball/f9de705c5b8631ec74353bb9f0b5077d50328ab2", + "reference": "f9de705c5b8631ec74353bb9f0b5077d50328ab2", "shasum": "" }, "require": { - "guzzle/guzzle": ">=3.0,<4.0" + "guzzle/guzzle": "~3.0" }, "require-dev": { "silex/silex": "1.0.x-dev@dev", - "symfony/http-foundation": ">=2.0,<3.0" + "symfony/http-foundation": "~2.0" }, "suggest": { "symfony/http-foundation": "To bind symfony request to ReCaptcha" @@ -1586,12 +1586,12 @@ "source": { "type": "git", "url": "https://github.com/romainneutron/Silex-Filesystem-Service-Provider.git", - "reference": "1.0.0" + "reference": "98771524bba1ffa58373c4c06d438f5fb5442ff4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/romainneutron/Silex-Filesystem-Service-Provider/zipball/1.0.0", - "reference": "1.0.0", + "url": "https://api.github.com/repos/romainneutron/Silex-Filesystem-Service-Provider/zipball/98771524bba1ffa58373c4c06d438f5fb5442ff4", + "reference": "98771524bba1ffa58373c4c06d438f5fb5442ff4", "shasum": "" }, "require": { @@ -1677,12 +1677,12 @@ "source": { "type": "git", "url": "https://github.com/romainneutron/Sphinx-Search-API-PHP-Client.git", - "reference": "2.0.8" + "reference": "a108fda835a9f8717e8fc22f2f35106e0f49dbdc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/romainneutron/Sphinx-Search-API-PHP-Client/zipball/2.0.8", - "reference": "2.0.8", + "url": "https://api.github.com/repos/romainneutron/Sphinx-Search-API-PHP-Client/zipball/a108fda835a9f8717e8fc22f2f35106e0f49dbdc", + "reference": "a108fda835a9f8717e8fc22f2f35106e0f49dbdc", "shasum": "" }, "require": { @@ -1719,12 +1719,12 @@ "source": { "type": "git", "url": "https://github.com/romainneutron/Temporary-Filesystem.git", - "reference": "2.1.0" + "reference": "3b06c337e347fde7d0a7e3cee24133ccf4950ae9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/romainneutron/Temporary-Filesystem/zipball/2.1.0", - "reference": "2.1.0", + "url": "https://api.github.com/repos/romainneutron/Temporary-Filesystem/zipball/3b06c337e347fde7d0a7e3cee24133ccf4950ae9", + "reference": "3b06c337e347fde7d0a7e3cee24133ccf4950ae9", "shasum": "" }, "require": { @@ -1759,12 +1759,12 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/PHP-FFmpeg.git", - "reference": "0.3.2" + "reference": "9fcb485d497872e674cb14eb3df1386dbda9169b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/PHP-FFmpeg/zipball/0.3.2", - "reference": "0.3.2", + "url": "https://api.github.com/repos/alchemy-fr/PHP-FFmpeg/zipball/9fcb485d497872e674cb14eb3df1386dbda9169b", + "reference": "9fcb485d497872e674cb14eb3df1386dbda9169b", "shasum": "" }, "require": { @@ -1827,21 +1827,21 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/PHP-MP4Box.git", - "reference": "0.3.0" + "reference": "baa466be3f6d0b46d27bc0e255e958a95cb7738c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/PHP-MP4Box/zipball/0.3.0", - "reference": "0.3.0", + "url": "https://api.github.com/repos/alchemy-fr/PHP-MP4Box/zipball/baa466be3f6d0b46d27bc0e255e958a95cb7738c", + "reference": "baa466be3f6d0b46d27bc0e255e958a95cb7738c", "shasum": "" }, "require": { - "alchemy/binary-driver": ">=1.5,<2.0", + "alchemy/binary-driver": "~1.5", "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": ">=3.7,<4.0", - "silex/silex": ">=1.0,<2.0" + "phpunit/phpunit": "~3.7", + "silex/silex": "~1.0" }, "type": "library", "autoload": { @@ -1878,21 +1878,21 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/PHP-Unoconv.git", - "reference": "0.3.0" + "reference": "6d1e14a7467b5d637741396549529dc4d5f9f355" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/PHP-Unoconv/zipball/0.3.0", - "reference": "0.3.0", + "url": "https://api.github.com/repos/alchemy-fr/PHP-Unoconv/zipball/6d1e14a7467b5d637741396549529dc4d5f9f355", + "reference": "6d1e14a7467b5d637741396549529dc4d5f9f355", "shasum": "" }, "require": { - "alchemy/binary-driver": ">=1.5,<2.0", + "alchemy/binary-driver": "~1.5", "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": ">=3.7,<4.0", - "silex/silex": ">=1.0,<2.0" + "phpunit/phpunit": "~3.7", + "silex/silex": "~1.0" }, "type": "library", "autoload": { @@ -1920,7 +1920,7 @@ "keywords": [ "unoconv" ], - "time": "2013-06-25 09:53:08" + "time": "2013-06-25 10:09:59" }, { "name": "php-xpdf/php-xpdf", @@ -1928,12 +1928,12 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/PHP-XPDF.git", - "reference": "0.2.1" + "reference": "1cf94025fbdbe69dc976ce20c7ee3a377118ada3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/PHP-XPDF/zipball/0.2.1", - "reference": "0.2.1", + "url": "https://api.github.com/repos/alchemy-fr/PHP-XPDF/zipball/1cf94025fbdbe69dc976ce20c7ee3a377118ada3", + "reference": "1cf94025fbdbe69dc976ce20c7ee3a377118ada3", "shasum": "" }, "require": { @@ -1980,12 +1980,12 @@ "source": { "type": "git", "url": "https://github.com/schmittjoh/php-collection.git", - "reference": "0.2.0" + "reference": "acb02a921bb364f360ce786b13455345063c4a07" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/0.2.0", - "reference": "0.2.0", + "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/acb02a921bb364f360ce786b13455345063c4a07", + "reference": "acb02a921bb364f360ce786b13455345063c4a07", "shasum": "" }, "require": { @@ -2029,13 +2029,13 @@ "version": "9.15", "source": { "type": "git", - "url": "https://github.com/alchemy-fr/exiftool", - "reference": "9.15" + "url": "https://github.com/alchemy-fr/exiftool.git", + "reference": "0b05edb639d032181f3fae7df8dc1194e9210dc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/exiftool/zipball/9.15", - "reference": "9.15", + "url": "https://api.github.com/repos/alchemy-fr/exiftool/zipball/0b05edb639d032181f3fae7df8dc1194e9210dc4", + "reference": "0b05edb639d032181f3fae7df8dc1194e9210dc4", "shasum": "" }, "require": { @@ -2066,12 +2066,12 @@ "source": { "type": "git", "url": "https://github.com/romainneutron/PHPExiftool.git", - "reference": "0.3.0" + "reference": "5c7d6124729eb34f2d86f730e534067e6be31ab9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/romainneutron/PHPExiftool/zipball/0.3.0", - "reference": "0.3.0", + "url": "https://api.github.com/repos/romainneutron/PHPExiftool/zipball/5c7d6124729eb34f2d86f730e534067e6be31ab9", + "reference": "5c7d6124729eb34f2d86f730e534067e6be31ab9", "shasum": "" }, "require": { @@ -2127,16 +2127,16 @@ }, { "name": "phpoption/phpoption", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/php-option.git", - "reference": "1.2.0" + "reference": "1c7e8016289d17d83ced49c56d0f266fd0568941" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/1.2.0", - "reference": "1.2.0", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/1c7e8016289d17d83ced49c56d0f266fd0568941", + "reference": "1c7e8016289d17d83ced49c56d0f266fd0568941", "shasum": "" }, "require": { @@ -2145,7 +2145,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2-dev" + "dev-master": "1.3-dev" } }, "autoload": { @@ -2172,7 +2172,7 @@ "php", "type" ], - "time": "2013-03-25 02:51:40" + "time": "2013-05-19 11:09:35" }, { "name": "pimple/pimple", @@ -2180,12 +2180,12 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Pimple.git", - "reference": "v1.0.2" + "reference": "ae11e57e8c2bb414b2ff93396dbbfc0eb92feb94" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Pimple/zipball/v1.0.2", - "reference": "v1.0.2", + "url": "https://api.github.com/repos/fabpot/Pimple/zipball/ae11e57e8c2bb414b2ff93396dbbfc0eb92feb94", + "reference": "ae11e57e8c2bb414b2ff93396dbbfc0eb92feb94", "shasum": "" }, "require": { @@ -2225,13 +2225,13 @@ "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/php-fig/log", - "reference": "1.0.0" + "url": "https://github.com/php-fig/log.git", + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b" }, "dist": { "type": "zip", - "url": "https://github.com/php-fig/log/archive/1.0.0.zip", - "reference": "1.0.0", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b", + "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b", "shasum": "" }, "type": "library", @@ -2342,23 +2342,23 @@ }, { "name": "silex/web-profiler", - "version": "v1.0.0", + "version": "v1.0.1", "target-dir": "Silex/Provider", "source": { "type": "git", "url": "https://github.com/silexphp/Silex-WebProfiler.git", - "reference": "v1.0.0" + "reference": "3d875ac4f583e893a076ec51478e38eeaf0cb562" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Silex-WebProfiler/zipball/v1.0.0", - "reference": "v1.0.0", + "url": "https://api.github.com/repos/silexphp/Silex-WebProfiler/zipball/3d875ac4f583e893a076ec51478e38eeaf0cb562", + "reference": "3d875ac4f583e893a076ec51478e38eeaf0cb562", "shasum": "" }, "require": { - "silex/silex": ">=1.0,<2.0", - "symfony/stopwatch": ">=2.2,<3.0", - "symfony/web-profiler-bundle": ">=2.2,<3.0" + "silex/silex": "~1.0", + "symfony/stopwatch": "~2.2", + "symfony/web-profiler-bundle": "~2.2" }, "type": "library", "extra": { @@ -2383,7 +2383,7 @@ ], "description": "A WebProfiler for Silex", "homepage": "http://silex.sensiolabs.org/", - "time": "2013-03-08 07:16:44" + "time": "2013-05-03 17:04:41" }, { "name": "swftools/swftools", @@ -2391,12 +2391,12 @@ "source": { "type": "git", "url": "https://github.com/alchemy-fr/PHPSwftools.git", - "reference": "0.3.1" + "reference": "5a0fefbd5a518c9b1ec2ba247640aadbab4cc396" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/PHPSwftools/zipball/0.3.1", - "reference": "0.3.1", + "url": "https://api.github.com/repos/alchemy-fr/PHPSwftools/zipball/5a0fefbd5a518c9b1ec2ba247640aadbab4cc396", + "reference": "5a0fefbd5a518c9b1ec2ba247640aadbab4cc396", "shasum": "" }, "require": { @@ -2427,7 +2427,7 @@ }, { "name": "Phraseanet Team", - "email": "info@alchemy.fr", + "email": "support@alchemy.fr", "homepage": "http://www.phraseanet.com/" } ], @@ -2445,12 +2445,12 @@ "source": { "type": "git", "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "v4.3.1" + "reference": "ae540bed1079c07aa12e9e62d9d8d4fc49bbdff2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/v4.3.1", - "reference": "v4.3.1", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/ae540bed1079c07aa12e9e62d9d8d4fc49bbdff2", + "reference": "ae540bed1079c07aa12e9e62d9d8d4fc49bbdff2", "shasum": "" }, "require": { @@ -2495,18 +2495,18 @@ "source": { "type": "git", "url": "https://github.com/symfony/Icu.git", - "reference": "v1.2.0" + "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Icu/zipball/v1.2.0", - "reference": "v1.2.0", + "url": "https://api.github.com/repos/symfony/Icu/zipball/7299cd3d8d6602103d1ebff5d0a9917b7bc6de72", + "reference": "7299cd3d8d6602103d1ebff5d0a9917b7bc6de72", "shasum": "" }, "require": { "lib-icu": ">=4.4", "php": ">=5.3.3", - "symfony/intl": ">=2.3,<3.0" + "symfony/intl": "~2.3" }, "type": "library", "autoload": { @@ -2538,16 +2538,16 @@ }, { "name": "symfony/symfony", - "version": "v2.3.3", + "version": "v2.3.4", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "v2.3.3" + "reference": "4fb225f4e315c11aa6d8935b1c0ceaf48ba39f1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/v2.3.3", - "reference": "v2.3.3", + "url": "https://api.github.com/repos/symfony/symfony/zipball/4fb225f4e315c11aa6d8935b1c0ceaf48ba39f1f", + "reference": "4fb225f4e315c11aa6d8935b1c0ceaf48ba39f1f", "shasum": "" }, "require": { @@ -2642,7 +2642,7 @@ "keywords": [ "framework" ], - "time": "2013-08-07 17:11:16" + "time": "2013-08-27 08:58:24" }, { "name": "tecnick.com/tcpdf", @@ -2650,7 +2650,7 @@ "source": { "type": "git", "url": "http://git.code.sf.net/p/tcpdf/code", - "reference": "6.0.023" + "reference": "3ebcb4d8d952ffdcb0fb95db8855da46a8590a26" }, "require": { "php": ">=5.3.0" @@ -2703,16 +2703,16 @@ }, { "name": "themattharris/tmhoauth", - "version": "0.8.2", + "version": "0.8.3", "source": { "type": "git", "url": "https://github.com/themattharris/tmhOAuth.git", - "reference": "0.8.2" + "reference": "47dcee2ac74f8c032d2a1afb836e65108bf582b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/themattharris/tmhOAuth/zipball/0.8.2", - "reference": "0.8.2", + "url": "https://api.github.com/repos/themattharris/tmhOAuth/zipball/47dcee2ac74f8c032d2a1afb836e65108bf582b7", + "reference": "47dcee2ac74f8c032d2a1afb836e65108bf582b7", "shasum": "" }, "require": { @@ -2741,7 +2741,7 @@ "oauth", "twitter" ], - "time": "2013-06-15 18:00:16" + "time": "2013-08-19 23:46:08" }, { "name": "twig/extensions", @@ -2749,12 +2749,12 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Twig-extensions.git", - "reference": "v1.0.0" + "reference": "921799aaf05f88af749d72912d6b154dfeb9a03e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/v1.0.0", - "reference": "v1.0.0", + "url": "https://api.github.com/repos/fabpot/Twig-extensions/zipball/921799aaf05f88af749d72912d6b154dfeb9a03e", + "reference": "921799aaf05f88af749d72912d6b154dfeb9a03e", "shasum": "" }, "require": { @@ -2796,12 +2796,12 @@ "source": { "type": "git", "url": "https://github.com/fabpot/Twig.git", - "reference": "v1.13.2" + "reference": "6d6a1009427d1f398c9d40904147bf9f723d5755" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Twig/zipball/v1.13.2", - "reference": "v1.13.2", + "url": "https://api.github.com/repos/fabpot/Twig/zipball/6d6a1009427d1f398c9d40904147bf9f723d5755", + "reference": "6d6a1009427d1f398c9d40904147bf9f723d5755", "shasum": "" }, "require": { @@ -2844,13 +2844,13 @@ "version": "1.12.1", "source": { "type": "git", - "url": "https://github.com/alchemy-fr/gdata", - "reference": "1.12.1" + "url": "https://github.com/alchemy-fr/gdata.git", + "reference": "4ae96d26cec159d74ced57c89ebdcde754ece35d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/gdata/zipball/1.12.1", - "reference": "1.12.1", + "url": "https://api.github.com/repos/alchemy-fr/gdata/zipball/4ae96d26cec159d74ced57c89ebdcde754ece35d", + "reference": "4ae96d26cec159d74ced57c89ebdcde754ece35d", "shasum": "" }, "require": { @@ -2884,31 +2884,31 @@ "packages-dev": [ { "name": "behat/behat", - "version": "v2.4.6", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/Behat/Behat.git", - "reference": "v2.4.6" + "reference": "b7e0e98dd7b50f2fccfbfad0d6495b0e022856b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/Behat/zipball/v2.4.6", - "reference": "v2.4.6", + "url": "https://api.github.com/repos/Behat/Behat/zipball/b7e0e98dd7b50f2fccfbfad0d6495b0e022856b3", + "reference": "b7e0e98dd7b50f2fccfbfad0d6495b0e022856b3", "shasum": "" }, "require": { - "behat/gherkin": ">=2.2.9,<2.3", + "behat/gherkin": "~2.2.9", "php": ">=5.3.1", - "symfony/config": ">=2.0,<3.0", - "symfony/console": ">=2.0,<3.0", - "symfony/dependency-injection": ">=2.0,<3.0", - "symfony/event-dispatcher": ">=2.0,<3.0", - "symfony/finder": ">=2.0,<3.0", - "symfony/translation": ">=2.0,<3.0", - "symfony/yaml": ">=2.0,<3.0" + "symfony/config": "~2.0", + "symfony/console": "~2.0", + "symfony/dependency-injection": "~2.0", + "symfony/event-dispatcher": "~2.0", + "symfony/finder": "~2.0", + "symfony/translation": "~2.0", + "symfony/yaml": "~2.0" }, "require-dev": { - "phpunit/phpunit": ">=3.7.19.0,<3.8" + "phpunit/phpunit": "~3.7.19" }, "suggest": { "behat/mink-extension": "for integration with Mink testing framework", @@ -2947,7 +2947,7 @@ "Behat", "Symfony2" ], - "time": "2013-06-06 10:46:48" + "time": "2013-08-11 16:11:33" }, { "name": "behat/gherkin", @@ -3071,19 +3071,19 @@ "source": { "type": "git", "url": "https://github.com/Behat/MinkBrowserKitDriver.git", - "reference": "v1.1.0" + "reference": "63960c8fcad4529faad1ff33e950217980baa64c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/MinkBrowserKitDriver/zipball/v1.1.0", - "reference": "v1.1.0", + "url": "https://api.github.com/repos/Behat/MinkBrowserKitDriver/zipball/63960c8fcad4529faad1ff33e950217980baa64c", + "reference": "63960c8fcad4529faad1ff33e950217980baa64c", "shasum": "" }, "require": { - "behat/mink": ">=1.5,<1.6", + "behat/mink": "~1.5.0", "php": ">=5.3.1", - "symfony/browser-kit": ">=2.0,<3.0", - "symfony/dom-crawler": ">=2.0,<3.0" + "symfony/browser-kit": "~2.0", + "symfony/dom-crawler": "~2.0" }, "require-dev": { "silex/silex": "@dev" @@ -3122,25 +3122,25 @@ }, { "name": "behat/mink-extension", - "version": "v1.1.4", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/Behat/MinkExtension.git", - "reference": "v1.1.4" + "reference": "0b7223826341fad69b4600afe27722d2a2f9a306" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/v1.1.4", - "reference": "v1.1.4", + "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/0b7223826341fad69b4600afe27722d2a2f9a306", + "reference": "0b7223826341fad69b4600afe27722d2a2f9a306", "shasum": "" }, "require": { - "behat/behat": ">=2.4.5,<2.5", + "behat/behat": "~2.5.0", "behat/mink": ">=1.4.3,<1.6-dev", "php": ">=5.3.2" }, "require-dev": { - "behat/mink-goutte-driver": ">=1.0,<2.0" + "behat/mink-goutte-driver": "~1.0" }, "type": "behat-extension", "extra": { @@ -3172,7 +3172,7 @@ "test", "web" ], - "time": "2013-06-04 12:18:22" + "time": "2013-08-17 19:01:06" }, { "name": "behat/mink-goutte-driver", @@ -3180,12 +3180,12 @@ "source": { "type": "git", "url": "https://github.com/Behat/MinkGoutteDriver.git", - "reference": "v1.0.9" + "reference": "fa1b073b48761464feb0b05e6825da44b20118d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Behat/MinkGoutteDriver/zipball/v1.0.9", - "reference": "v1.0.9", + "url": "https://api.github.com/repos/Behat/MinkGoutteDriver/zipball/fa1b073b48761464feb0b05e6825da44b20118d8", + "reference": "fa1b073b48761464feb0b05e6825da44b20118d8", "shasum": "" }, "require": { @@ -3340,21 +3340,21 @@ }, { "name": "fabpot/goutte", - "version": "v1.0.2", + "version": "v1.0.3", "source": { "type": "git", "url": "https://github.com/fabpot/Goutte.git", - "reference": "v1.0.2" + "reference": "75c9f23c4122caf4ea3e87a42a00b471366e707f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fabpot/Goutte/zipball/v1.0.2", - "reference": "v1.0.2", + "url": "https://api.github.com/repos/fabpot/Goutte/zipball/75c9f23c4122caf4ea3e87a42a00b471366e707f", + "reference": "75c9f23c4122caf4ea3e87a42a00b471366e707f", "shasum": "" }, "require": { "ext-curl": "*", - "guzzle/http": ">=3.0.5,<3.7-dev", + "guzzle/http": ">=3.0.5,<3.8-dev", "php": ">=5.3.0", "symfony/browser-kit": "~2.1", "symfony/css-selector": "~2.1", @@ -3363,8 +3363,8 @@ "symfony/process": "~2.1" }, "require-dev": { - "guzzle/plugin-history": ">=3.0.5,<3.7-dev", - "guzzle/plugin-mock": ">=3.0.5,<3.7-dev" + "guzzle/plugin-history": ">=3.0.5,<3.8-dev", + "guzzle/plugin-mock": ">=3.0.5,<3.8-dev" }, "type": "application", "extra": { @@ -3392,26 +3392,29 @@ "keywords": [ "scraper" ], - "time": "2013-07-15 19:47:12" + "time": "2013-08-16 06:03:22" }, { "name": "instaclick/php-webdriver", - "version": "1.0.14", + "version": "1.0.16", "source": { "type": "git", "url": "https://github.com/instaclick/php-webdriver.git", - "reference": "1.0.14" + "reference": "10dcea308e5cf4c182c8fd0ca7f8381aefc4a416" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/1.0.14", - "reference": "1.0.14", + "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/10dcea308e5cf4c182c8fd0ca7f8381aefc4a416", + "reference": "10dcea308e5cf4c182c8fd0ca7f8381aefc4a416", "shasum": "" }, "require": { "ext-curl": "*", "php": ">=5.3.2" }, + "bin": [ + "bin/webunit" + ], "type": "library", "extra": { "branch-alias": { @@ -3436,18 +3439,18 @@ { "name": "Anthon Pang", "email": "apang@softwaredevelopment.ca", - "role": "developer" + "role": "Fork Maintainer" } ], "description": "PHP WebDriver for Selenium 2", - "homepage": "http://instaclick.com/torontotechjobs/", + "homepage": "http://instaclick.com/", "keywords": [ "browser", "selenium", "webdriver", "webtest" ], - "time": "2013-06-12 03:00:14" + "time": "2013-08-08 13:56:39" }, { "name": "phpunit/php-code-coverage", @@ -3455,12 +3458,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "1.2.12" + "reference": "0e9958c459d675fb497d8dc5001c91d335734e48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/1.2.12", - "reference": "1.2.12", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/0e9958c459d675fb497d8dc5001c91d335734e48", + "reference": "0e9958c459d675fb497d8dc5001c91d335734e48", "shasum": "" }, "require": { @@ -3605,12 +3608,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "1.0.5" + "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1.0.5", - "reference": "1.0.5", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/19689d4354b295ee3d8c54b4f42c3efb69cbc17c", + "reference": "19689d4354b295ee3d8c54b4f42c3efb69cbc17c", "shasum": "" }, "require": { @@ -3649,12 +3652,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "1.2.0" + "reference": "31babf400e5b5868573bf49a000a3519d3978233" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1.2.0", - "reference": "1.2.0", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/31babf400e5b5868573bf49a000a3519d3978233", + "reference": "31babf400e5b5868573bf49a000a3519d3978233", "shasum": "" }, "require": { @@ -3695,16 +3698,16 @@ }, { "name": "phpunit/phpunit", - "version": "3.7.23", + "version": "3.7.24", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3.7.23" + "reference": "af7b77ccb5c64458bdfca95665d29558d1df7d08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3.7.23", - "reference": "3.7.23", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/af7b77ccb5c64458bdfca95665d29558d1df7d08", + "reference": "af7b77ccb5c64458bdfca95665d29558d1df7d08", "shasum": "" }, "require": { @@ -3765,20 +3768,20 @@ "testing", "xunit" ], - "time": "2013-08-02 19:14:44" + "time": "2013-08-09 06:58:24" }, { "name": "phpunit/phpunit-mock-objects", "version": "1.2.3", "source": { "type": "git", - "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "1.2.3" + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875" }, "dist": { "type": "zip", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.2.3.zip", - "reference": "1.2.3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/5794e3c5c5ba0fb037b11d8151add2a07fa82875", + "reference": "5794e3c5c5ba0fb037b11d8151add2a07fa82875", "shasum": "" }, "require": { From ba980d5f3495d8ba703cf5086860a3cff7da46e9 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Mon, 2 Sep 2013 17:13:18 +0200 Subject: [PATCH 05/11] Fix tmp directories cleanup --- .../Phrasea/Setup/Requirements/FilesystemRequirements.php | 2 ++ lib/classes/appbox.php | 3 +++ lib/classes/module/console/systemClearCache.php | 5 ++++- tmp/cache/profiler/.gitignore | 2 ++ tmp/doctrine/.gitignore | 2 ++ tmp/serializer/.gitignore | 2 ++ 6 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 tmp/cache/profiler/.gitignore create mode 100644 tmp/doctrine/.gitignore create mode 100644 tmp/serializer/.gitignore diff --git a/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php b/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php index 057734fe26..4656a5b1bc 100644 --- a/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php +++ b/lib/Alchemy/Phrasea/Setup/Requirements/FilesystemRequirements.php @@ -34,6 +34,8 @@ class FilesystemRequirements extends RequirementCollection implements Requiremen $baseDir . '/www/custom', $baseDir . '/tmp/locks', $baseDir . '/tmp/cache_twig', + $baseDir . '/tmp/serializer', + $baseDir . '/tmp/doctrine', $baseDir . '/tmp/cache_minify', $baseDir . '/tmp/lazaret', $baseDir . '/tmp/desc_tmp', diff --git a/lib/classes/appbox.php b/lib/classes/appbox.php index d5f9013e7b..8633ac5732 100644 --- a/lib/classes/appbox.php +++ b/lib/classes/appbox.php @@ -322,6 +322,9 @@ class appbox extends base $finder->in(array( $this->app['root.path'] . '/tmp/cache_minify/', $this->app['root.path'] . '/tmp/cache_twig/', + $this->app['root.path'] . '/tmp/cache/profiler/', + $this->app['root.path'] . '/tmp/doctrine/', + $this->app['root.path'] . '/tmp/serializer/', )) ->depth(0) ->ignoreVCS(true) diff --git a/lib/classes/module/console/systemClearCache.php b/lib/classes/module/console/systemClearCache.php index 8f294a890f..9f350f7188 100644 --- a/lib/classes/module/console/systemClearCache.php +++ b/lib/classes/module/console/systemClearCache.php @@ -41,7 +41,10 @@ class module_console_systemClearCache extends Command ->exclude('.svn') ->in(array( $this->container['root.path'] . '/tmp/cache_minify/', - $this->container['root.path'] . '/tmp/cache_twig/' + $this->container['root.path'] . '/tmp/cache_twig/', + $this->container['root.path'] . '/tmp/cache/profiler/', + $this->container['root.path'] . '/tmp/doctrine/', + $this->container['root.path'] . '/tmp/serializer/', )); $filesystem = new Filesystem(); diff --git a/tmp/cache/profiler/.gitignore b/tmp/cache/profiler/.gitignore new file mode 100644 index 0000000000..d6b7ef32c8 --- /dev/null +++ b/tmp/cache/profiler/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/tmp/doctrine/.gitignore b/tmp/doctrine/.gitignore new file mode 100644 index 0000000000..d6b7ef32c8 --- /dev/null +++ b/tmp/doctrine/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore diff --git a/tmp/serializer/.gitignore b/tmp/serializer/.gitignore new file mode 100644 index 0000000000..d6b7ef32c8 --- /dev/null +++ b/tmp/serializer/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore From ce3f1b30f49ac920f5e328f2cfaf0aa789c536a9 Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Wed, 4 Sep 2013 17:43:00 +0200 Subject: [PATCH 06/11] Fix task manager localization --- templates/web/admin/tasks/list.html.twig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/web/admin/tasks/list.html.twig b/templates/web/admin/tasks/list.html.twig index 0d71ca621f..3e40e71e44 100644 --- a/templates/web/admin/tasks/list.html.twig +++ b/templates/web/admin/tasks/list.html.twig @@ -54,11 +54,11 @@
From 190d3839a455f804076559bf9bddd8ae3945050a Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Wed, 4 Sep 2013 21:57:41 +0200 Subject: [PATCH 07/11] Fix #1142 JS error while validating user inscriptions --- templates/web/admin/user/demand.html.twig | 297 +++++++++++++--------- 1 file changed, 172 insertions(+), 125 deletions(-) diff --git a/templates/web/admin/user/demand.html.twig b/templates/web/admin/user/demand.html.twig index f235048d72..a06bb5935b 100644 --- a/templates/web/admin/user/demand.html.twig +++ b/templates/web/admin/user/demand.html.twig @@ -19,92 +19,163 @@ $(document).ready(function(){ resize(); + $(window).resize(function(){ resize(); }); - }); + var $form = $("form#accept-demand"); + var $mainBtnAction = $(".btn-all-action", $form); + var $basesBtnAction = $(".btn-single-action", $form); - function checkDeny(el) - { - if(!$(el).hasClass('active')) - { - $('.disabler_'+$(el).attr('id').substring(5)).removeClass('active'); - } - else - { - } - } + $(".btn-all-action, .btn-single-action").on("uncheck-all", function(event) { + $("button", $(event.currentTarget)).removeClass("active"); + }).on("uncheck-deny", function(event) { + var $btnGroup = $(event.currentTarget); + var $denyButton = $(".deny-checker", $btnGroup); + + if ($denyButton.hasClass("active")) { + $denyButton.removeClass("active"); + $(".deny-checker", $mainBtnAction).removeClass("active"); + } + }).on("check-deny", function(event) { + var $btnGroup = $(event.currentTarget); + var $denyButton = $(".deny-checker", $btnGroup); - function checkAdd(el) - { - if(!$(el).hasClass('active')) - { - $('#accept_'+$(el).attr('id').substring(10)).addClass('active'); - $('#deny_'+$(el).attr('id').substring(10)).removeClass('active'); - } - } + if (false === $denyButton.hasClass("active")) { + $btnGroup.trigger("uncheck-all"); + $denyButton.addClass("active"); - function checkRemove(el) - { - if($(el).hasClass('active')) - { - $('.disabler_'+$(el).attr('id').substring(7)).each(function(){ - $(this).removeClass('active'); - }); - $(el).addClass('active'); - } - else - { - $('#deny_'+$(el).attr('id').substring(7)).removeClass('active'); - } - } + var nbActiveButton = $(".deny-checker.active", $basesBtnAction).length; + var totalBtn = $(".deny-checker", $basesBtnAction).length; + + if (nbActiveButton === totalBtn) { + $(".deny-checker", $mainBtnAction).addClass("active"); + } + } + }).on("check-accept", function(event) { + var $btnGroup = $(event.currentTarget); + var $acceptBtn = $(".accept-checker", $btnGroup); - function modelChecker(usr) - { - var val = $('#model_'+usr)[0].value; + if (false === $acceptBtn.hasClass("active")) { + $btnGroup.trigger('uncheck-deny'); + $acceptBtn.addClass("active"); - var bool = false; - if(!isNaN(val) && val!== '') - bool = true; + var nbActiveButton = $(".accept-checker.active", $basesBtnAction).length; + var totalBtn = $(".accept-checker", $basesBtnAction).length; - if(bool) - $('#sub_usr_'+usr).slideToggle('slow'); - else - $('#sub_usr_'+usr).slideToggle('slow'); + if (nbActiveButton === totalBtn) { + $(".accept-checker", $mainBtnAction).addClass("active"); + } + } + }).on("uncheck-accept", function(event) { + var $btnGroup = $(event.currentTarget); + var $acceptBtn = $(".accept-checker", $btnGroup); - if(bool) - $('.checker_'+usr).attr('disabled','disabled'); - else - $('.checker_'+usr).removeAttr('disabled'); + if ($acceptBtn.hasClass("active")) { + $acceptBtn.removeClass("active"); + $(".accept-checker", $mainBtnAction).removeClass("active"); + + $btnGroup.trigger("uncheck-hd"); + $btnGroup.trigger("uncheck-watermark"); + } + }).on('check-hd', function(event) { + var $btnGroup = $(event.currentTarget); + var $hdBtn = $(".accept-hd-checker", $btnGroup); - } + if (false === $hdBtn.hasClass("active")) { + $hdBtn.addClass('active'); - function checkAll(that) - { - var bool = true; - var first = true; - $('.'+that+'_checker:not(.active)').each(function(){ - // if(!$(this)[0].disabled) - // { - if(first && !$(this).hasClass('active')) - bool = false; - if (bool === false) - $(this).removeClass('active'); - else - $(this).addClass('active'); - first = false; - if(that === 'deny') - checkDeny($(this)); - if(that === 'accept_hd') - checkAdd(this); - if(that === 'watermark') - checkAdd(this); - if(that === 'accept') - checkRemove(this); - // } + var nbActiveButton = $(".accept-hd-checker.active", $basesBtnAction).length; + var totalBtn = $(".accept-hd-checker", $basesBtnAction).length; + + if (nbActiveButton === totalBtn) { + $(".accept-hd-checker", $mainBtnAction).addClass("active"); + } + + $btnGroup.trigger('uncheck-deny').trigger('check-accept'); + } + }).on('uncheck-hd', function(event) { + var $btnGroup = $(event.currentTarget); + var $hdBtn = $(".accept-hd-checker", $btnGroup); + + if ($hdBtn.hasClass("active")) { + $hdBtn.removeClass("active"); + $(".accept-hd-checker", $mainBtnAction).removeClass("active"); + } + }).on('check-watermark', function(event) { + var $btnGroup = $(event.currentTarget); + var $watermarkBtn = $(".accept-watermark-checker", $btnGroup); + + if (false === $watermarkBtn.hasClass("active")) { + $watermarkBtn.addClass('active'); + + var nbActiveButton = $(".accept-watermark-checker.active", $basesBtnAction).length; + var totalBtn = $(".accept-watermark-checker", $basesBtnAction).length; + + if (nbActiveButton === totalBtn) { + $(".accept-watermark-checker", $mainBtnAction).addClass("active"); + } + + $btnGroup.trigger('uncheck-deny').trigger('check-accept'); + } + }).on('uncheck-watermark', function(event) { + var $btnGroup = $(event.currentTarget); + var $watermarkBtn = $(".accept-watermark-checker", $btnGroup); + + if ($watermarkBtn.hasClass("active")) { + $watermarkBtn.removeClass('active'); + $(".accept-watermark-checker", $mainBtnAction).removeClass("active"); + } }); - } + + $.each([ + $('.deny-checker', $basesBtnAction), + $('.accept-checker', $basesBtnAction), + $('.accept-hd-checker', $basesBtnAction), + $('.accept-watermark-checker', $basesBtnAction) + ], function(i, buttons) { + buttons.bind("click", function(event) { + var $this = $(this); + var $btnGroup = $this.closest('.btn-group'); + var event = $this.data('event'); + + if ($this.hasClass("active")) { + $btnGroup.trigger("uncheck-"+ event); + } else { + $btnGroup.trigger('check-' + event); + } + }); + }); + + $.each([ + $('.deny-checker', $mainBtnAction), + $('.accept-checker', $mainBtnAction), + $('.accept-hd-checker', $mainBtnAction), + $('.accept-watermark-checker', $mainBtnAction) + ], function(i, buttons) { + buttons.bind("click", function(event) { + var $this = $(this); + var event = $this.data('event'); + + if ($this.hasClass("active")) { + $mainBtnAction.trigger("uncheck-"+ event); + $basesBtnAction.trigger("uncheck-"+ event); + } else { + $mainBtnAction.trigger('check-' + event); + $basesBtnAction.trigger('check-' + event); + } + }); + }); + + $(".submit", $form).bind("click", function (event) { + $(".btn.active", $basesBtnAction).each(function() { + $("").attr("type", "hidden").attr("name", this.name).val(this.value).appendTo($form); + }); + + $form.submit(); + }); + });
@@ -119,19 +190,19 @@ {% endif %} {% if table['user'] | length > 0 %} -
-
- - - -
@@ -139,7 +210,6 @@ {% trans 'Informations' %} - {% trans 'admin::compte-utilisateur date d\'inscription' %} {% trans 'admin::collection' %} {% trans 'Models' %} @@ -152,7 +222,9 @@
- {{ loop.index }} + + {{ app['date-formatter'].getPrettyString(row["date_modif"]) }} + -
@@ -178,52 +250,27 @@
{{ row['ville'] }}
{{ row['pays'] }}
- 		- {{ app['date-formatter'].getPrettyString(row["date_modif"]) }} - {# Delete this when the JS 'll be updated -- - - {% for basId in colls %} - - - - - - - - {% endfor %} -
- - - - - - - - - {{ basId| bas_labels(app) }} -
- {#-- End of delete #} {% for basId in colls %} -
- - - - -

{{ basId| bas_labels(app) }}

+ {% set btn_value = row['usr_id'] ~ "_" ~ basId %} +
+ + + + +
{% endfor %} 		@@ -242,7 +289,7 @@
- +
{% else %} From ce55141917280c1b80f195fe3dcb4dc5a7b24616 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Thu, 5 Sep 2013 12:04:18 +0200 Subject: [PATCH 08/11] Fix #1445 Wording & issue while moving record from collections --- .../Phrasea/Controller/Prod/Language.php | 6 + .../prod/actions/collection_default.html.twig | 170 +++++++++--------- www/skins/prod/jquery.main-prod.js | 14 +- 3 files changed, 97 insertions(+), 93 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Language.php b/lib/Alchemy/Phrasea/Controller/Prod/Language.php index 754f165f70..43d1bd9b5b 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Language.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Language.php @@ -104,6 +104,12 @@ class Language implements ControllerProviderInterface $out['forceSendDocument'] = _('Force sending of the document ?'); $out['export'] = _('Export'); $out['share'] = _('Share'); + $out['move'] = _('Move'); + $out['push'] = _('Push'); + $out['feedback'] = _('Feedback'); + $out['toolbox'] = _('Tool box'); + $out['print'] = _('Print'); + $out['attention'] = _('Attention !'); return $app->json($out); }); diff --git a/templates/web/prod/actions/collection_default.html.twig b/templates/web/prod/actions/collection_default.html.twig index 0b2a5c4da7..cd775c75e8 100644 --- a/templates/web/prod/actions/collection_default.html.twig +++ b/templates/web/prod/actions/collection_default.html.twig @@ -1,55 +1,55 @@ -
-
- {% if records.databoxes() | length > 1 %}1 - {% trans 'prod::Les enregistrements ne provienent pas tous de la meme base et ne peuvent donc etre traites ensemble' %} -
- +{% set canValid = false %} +
+ + {% if records.databoxes() | length > 1 %} +
+ {% trans 'prod::Les enregistrements ne provienent pas tous de la meme base et ne peuvent donc etre traites ensemble' %}
- {% elseif records | length == 0 %}2 - {% trans 'prod::Vous n\'avez le droit d\'effectuer l\'operation sur aucun document' %} -
- + {% elseif records | length == 0 %} +
+ {% trans 'prod::Vous n\'avez le droit d\'effectuer l\'operation sur aucun document' %}
- {% elseif collections | length == 0 %}3 - {% trans 'erreur : Vous n\'avez pas les droits' %} -
- + {% elseif collections | length == 0 %} +
+ {% trans 'erreur : Vous n\'avez pas les droits' %}
{% else %} + {% set canValid = true %} -
- {% if records | length != records.received() | length %} + {% if records | length != records.received() | length %} +
{% set countable = records.received().count() - records.count() %} {% trans %} - prod::collection {{countable}} documents ne pouvant etres mofiies + One document can not be modified. + {% plural countable %} + {{countable}} documents can not be modified. {% endtrans %} - {% endif %} +
+ {% endif %} + +
+ {% set countable = records | length %} + {% trans %} + Move one record to the chose collection in the list. + {% plural countable %} + Move {{ countable }} records to the chosen collection in the list. + {% endtrans %} +
+ +
+
- {% set countable = records | length %} - {% trans %} - prod::collection {{countable}} documents a deplacer - {% endtrans %} -
-
- -
-
-
{% if records.stories() | length > 0 %} - - - - - -
- - {% trans 'prod::collection deplacer egalement les documents rattaches a ce(s) regroupement(s)' %} -
+
+ +
{% endif %} @@ -58,55 +58,53 @@
- + +{% endif %} diff --git a/www/skins/prod/jquery.main-prod.js b/www/skins/prod/jquery.main-prod.js index 56627efcfa..2d2f8a0b16 100644 --- a/www/skins/prod/jquery.main-prod.js +++ b/www/skins/prod/jquery.main-prod.js @@ -1617,7 +1617,7 @@ function toggleRemoveReg(el) function deleteThis(lst) { if(lst.split(';').length === 0 ) { - alert(langage.nodocselected); + alert(language.nodocselected); return false; } @@ -1643,7 +1643,7 @@ function chgCollThis(datas) { $dialog = p4.Dialog.Create({ size:'Small', - title:'Move', + title: language.move, closeButton:true }); $.ajax({ @@ -1660,7 +1660,7 @@ function pushThis(sstt_id, lst, story) { $dialog = p4.Dialog.Create({ size:'Full', - title:'Push' + title:language.push }); $.post("../prod/push/sendform/", { @@ -1678,7 +1678,7 @@ function feedbackThis(sstt_id, lst, story) /* disable push closeonescape as an over dialog may exist (add user) */ $dialog = p4.Dialog.Create({ size:'Full', - title:'Feedback' + title:language.feedback }); $.post("../prod/push/validateform/", { @@ -1695,7 +1695,7 @@ function toolREFACTOR(datas){ var dialog = p4.Dialog.Create({ size:'Medium', - title:'Tool box', + title:language.toolbox, loading: true }); @@ -2345,7 +2345,7 @@ function checkDeleteThis(type, el) deleteBasket(el); }; - $('#DIALOG').empty().append(language.confirmDel).attr('title','Attention !').dialog({ + $('#DIALOG').empty().append(language.confirmDel).attr('title', language.attention).dialog({ autoOpen:false, resizable:false, modal:true, @@ -2376,7 +2376,7 @@ function printThis(value) if ($("#DIALOG").data("ui-dialog")) { $("#DIALOG").dialog('destroy'); } - $('#DIALOG').attr('title', 'Print') + $('#DIALOG').attr('title', language.print) .empty().addClass('loading') .dialog({ resizable:false, From 611b2ddab059c995b67d9862f2137778c48c8831 Mon Sep 17 00:00:00 2001 From: Nicolas Le Goff Date: Thu, 5 Sep 2013 12:14:06 +0200 Subject: [PATCH 09/11] Fix #1444 Select size --- templates/web/prod/actions/Property/type.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/web/prod/actions/Property/type.html.twig b/templates/web/prod/actions/Property/type.html.twig index 15f3b15c1e..591db4ead2 100644 --- a/templates/web/prod/actions/Property/type.html.twig +++ b/templates/web/prod/actions/Property/type.html.twig @@ -11,7 +11,7 @@
- {% for option in typesEnum %} From 4629e862107aec7d7e550670e1602bf171765c7b Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 5 Sep 2013 13:00:23 +0200 Subject: [PATCH 10/11] Fix #1338 reorder collections don't work --- templates/web/admin/collection/reorder.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/web/admin/collection/reorder.html.twig b/templates/web/admin/collection/reorder.html.twig index a28b196482..34131abeb1 100644 --- a/templates/web/admin/collection/reorder.html.twig +++ b/templates/web/admin/collection/reorder.html.twig @@ -80,7 +80,7 @@ var html = _.template($("#alert_"+ (datas.success ? "success" : "error") +"_tpl").html(), { content:datas.msg }); - $('#table-order').before(html); + $('#table-order').insertBefore(html); }, complete : function() { $this.attr('disabled', false); @@ -91,13 +91,13 @@ function moveUpItem(select){ select.find('option:selected').each(function(){ - $(this).before($(this).prev()); + $(this).insertBefore($(this).prev()); }); } function moveDownItem(select){ select.find('option:selected').each(function(){ - $(this).after($(this).next()); + $(this).insertAfter($(this).next()); }); } From 921c3965c0ea6b72d424b083337d2c9b432d1b5e Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Thu, 5 Sep 2013 12:29:23 +0200 Subject: [PATCH 11/11] Update dependencies, especially PHP-FFMpeg and Media-Alchemyst --- composer.lock | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/composer.lock b/composer.lock index 6e4f0628b3..cbf21199c6 100644 --- a/composer.lock +++ b/composer.lock @@ -1028,12 +1028,12 @@ "source": { "type": "git", "url": "https://github.com/avalanche123/Imagine.git", - "reference": "0a3cb3c7a6839f7f29fbff9fb76e31700a2692e2" + "reference": "64ed228095ec1f99e1124debf87b4b8ebd83070b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/0a3cb3c7a6839f7f29fbff9fb76e31700a2692e2", - "reference": "0a3cb3c7a6839f7f29fbff9fb76e31700a2692e2", + "url": "https://api.github.com/repos/avalanche123/Imagine/zipball/64ed228095ec1f99e1124debf87b4b8ebd83070b", + "reference": "64ed228095ec1f99e1124debf87b4b8ebd83070b", "shasum": "" }, "require": { @@ -1077,7 +1077,7 @@ "image manipulation", "image processing" ], - "time": "2013-08-30 12:28:56" + "time": "2013-09-02 21:53:44" }, { "name": "jms/metadata", @@ -1302,16 +1302,16 @@ }, { "name": "media-alchemyst/media-alchemyst", - "version": "0.3.4", + "version": "0.3.5", "source": { "type": "git", "url": "https://github.com/alchemy-fr/Media-Alchemyst.git", - "reference": "3d10c9d3fde4c6e77434b883ed14f08e60b0734b" + "reference": "da4dc484cff946a5a2bb1966c538e7132b542b8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/3d10c9d3fde4c6e77434b883ed14f08e60b0734b", - "reference": "3d10c9d3fde4c6e77434b883ed14f08e60b0734b", + "url": "https://api.github.com/repos/alchemy-fr/Media-Alchemyst/zipball/da4dc484cff946a5a2bb1966c538e7132b542b8c", + "reference": "da4dc484cff946a5a2bb1966c538e7132b542b8c", "shasum": "" }, "require": { @@ -1321,7 +1321,7 @@ "monolog/monolog": "~1.0", "neutron/temporary-filesystem": "~2.1", "php": ">=5.3.3", - "php-ffmpeg/php-ffmpeg": "~0.3.1", + "php-ffmpeg/php-ffmpeg": "~0.3.4", "php-mp4box/php-mp4box": "~0.3.0", "php-unoconv/php-unoconv": "~0.3.0", "pimple/pimple": "~1.0", @@ -1371,7 +1371,7 @@ "video", "video processing" ], - "time": "2013-08-08 10:18:56" + "time": "2013-09-05 10:26:38" }, { "name": "mediavorus/mediavorus", @@ -1755,16 +1755,16 @@ }, { "name": "php-ffmpeg/php-ffmpeg", - "version": "0.3.2", + "version": "0.3.4", "source": { "type": "git", "url": "https://github.com/alchemy-fr/PHP-FFmpeg.git", - "reference": "9fcb485d497872e674cb14eb3df1386dbda9169b" + "reference": "c7226654828600e0c44ac6689a07e741b32147dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/alchemy-fr/PHP-FFmpeg/zipball/9fcb485d497872e674cb14eb3df1386dbda9169b", - "reference": "9fcb485d497872e674cb14eb3df1386dbda9169b", + "url": "https://api.github.com/repos/alchemy-fr/PHP-FFmpeg/zipball/c7226654828600e0c44ac6689a07e741b32147dd", + "reference": "c7226654828600e0c44ac6689a07e741b32147dd", "shasum": "" }, "require": { @@ -1819,7 +1819,7 @@ "video", "video processing" ], - "time": "2013-08-08 10:15:15" + "time": "2013-09-05 10:09:39" }, { "name": "php-mp4box/php-mp4box", @@ -2646,11 +2646,11 @@ }, { "name": "tecnick.com/tcpdf", - "version": "6.0.023", + "version": "6.0.025", "source": { "type": "git", "url": "http://git.code.sf.net/p/tcpdf/code", - "reference": "3ebcb4d8d952ffdcb0fb95db8855da46a8590a26" + "reference": "a8ec5fe7efc5a18d64ad95a760e2626a52674d43" }, "require": { "php": ">=5.3.0" @@ -2699,7 +2699,7 @@ "pdf417", "qrcode" ], - "time": "2013-08-05 19:34:06" + "time": "2013-09-04 18:32:13" }, { "name": "themattharris/tmhoauth",