Merge branch 'develop'

antwebes · Mar 27, 2015 · 2e463f0 · 2e463f0
2 parents ba1f9f9 + e5b2913
commit 2e463f0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Resources/public/js/cities.js b/Resources/public/js/cities.js
@@ -100,19 +100,19 @@
         //if country has not cities
         if (!country.has_cities){
             if (country.city_default > 0){
-                $('#iframe_user_registration_city').val(country.city_default);
+                $('#user_registration_city').val(country.city_default);
             }else{
                 //error the country must has a city_default
-                $('#iframe_user_registration_city').val('666');
+                $('#user_registration_city').val('666');
             }
-            $('#registration_form_search_city').parent().parent().hide()
+            $('#registration_form_search_city').parent().parent().hide();
         }else{
             //empty input so user can write city and autocomplete
             $('#registration_form_search_city').val('');
             //empty value the id of city to save in user
-            $('#iframe_user_registration_city').val('');
+            $('#user_registration_city').val('');
             //show the input to write city
-            $('#registration_form_search_city').parent().parent().show()
+            $('#registration_form_search_city').parent().parent().show();
         }
     });
 

diff --git a/composer.json b/composer.json
@@ -13,9 +13,9 @@
     "license" : "MIT",
     "require" : {
         "symfony/framework-bundle": "~2.3",
-        "antwebes/chatea-common": "dev-master",
-        "antwebes/chatea-client-lib": "dev-master",
-        "antwebes/chatea-secure-bundle": "dev-master",
+        "antwebes/chatea-common": "0.1.0",
+        "antwebes/chatea-client-lib": "0.1.1",
+        "antwebes/chatea-secure-bundle": "0.1.1",
         "excelwebzone/recaptcha-bundle": "1.0.0"
     },
     "require-dev": {