Merge branch 'develop'

CHANGELOG-0.1.md

@@ -61,4 +61,7 @@ To get the diff between two versions, go to https://github.com/antwebes/ChateaCl
  * Update version chateaSecureBundle 0.1.3, users locked cannot login
 
 * 0.1.14(2015-05-07)
- * Photos user can to be paginated
+ * Photos user can to be paginated
+
+* 0.1.15(2015-05-1)
+ * Update version captch to branch 2.3

Resources/translations/UserRegistration.en.yml

@@ -46,4 +46,5 @@ user.register.i_need_help: "I need help"
 user.register.confirmed.title: "Congratulations %username% !! Your account is activated successfully"
 user.register.confirmed.message: "User %username% registered correctly . You can now start chatting."
 user.register.invalid_client: "Due to tecnichal problems, it is impsible to register users now. Please contacto with the webmaster of this site."
-user.confirm_email.not_owner_of_email: "This email is not associated with your User"
+user.confirm_email.not_owner_of_email: "This email is not associated with your User"
+user.confirm_email.already_requested: "Confirmation mail can only be requested once every 24 hours"

Resources/translations/UserRegistration.es.yml

@@ -46,4 +46,5 @@ user.register.i_need_help: "Necesito ayuda"
 user.register.confirmed.title: "Felicidadesa %username% !! Tu cuenta ha sido activada con éxiito"
 user.register.confirmed.message: "Usuario %username% registrado correctament. Puedes empezar a chatear ahora."
 user.register.invalid_client: "Debido a problemas técnicos en este momento nos es imposible realizar registros. Por favor pongase en contacto con el administrador de la web."
-user.confirm_email.not_owner_of_email: "El email introducido no está asociado a tu usuario"
+user.confirm_email.not_owner_of_email: "El email introducido no está asociado a tu usuario"
+user.confirm_email.already_requested: "La solicitud de envio de correo de confirnación solo puede ser realizado cada 24 horas"

Resources/views/User/confirmEmail.html.twig

@@ -135,7 +135,8 @@
         var messages = {
             success: '{{user.register.we_sent_you_verification_mail' | trans }}',
             server_errors: {
-                'The email is not linked with your account': '{{ 'user.confirm_email.not_owner_of_email' | trans }}'
+                'The email is not linked with your account': '{{ 'user.confirm_email.not_owner_of_email' | trans }}',
+                'Confirmation mail can only be requested once every 24 hours': '{{ 'user.confirm_email.already_requested' | trans }}'
             }
         };
     </script>

composer.json

@@ -1,29 +1,36 @@
 {
-    "name" : "antwebes/chatea-client-bundle",
-    "description" : "Symfony2 bundle for ChateaClient library, It makes it easy to use API of api.chatea.net",
-    "type" : "symfony-bundle",
-    "authors" : [{
-        "name" : "Xabier Fernández Rodríguez AS jjbier",
-        "email" : "[email protected]",
-        "homepage" : "https://github.com/antwebes",
-        "role" : "Developer"
-    }],
-    "keywords" : ["chatea","chateagratis","bundle","api"],
-    "homepage" : "https://github.com/antwebes/ChateaClientBundle",
-    "license" : "MIT",
-    "require" : {
-        "symfony/framework-bundle": "~2.3",
-        "antwebes/chatea-common": "0.1.0",
-        "antwebes/chatea-client-lib": "0.1.1",
-        "antwebes/chatea-secure-bundle": "0.1.3",
-        "excelwebzone/recaptcha-bundle": "1.0.0"
-    },
-    "require-dev": {
-        "raulfraile/ladybug": "~1.0"
-    },
-    "autoload": {
-        "psr-0": { "Ant\\Bundle\\ChateaClientBundle": "" }
-    },
-    "target-dir": "Ant/Bundle/ChateaClientBundle"
-
-}
+	"name" : "antwebes/chatea-client-bundle",
+	"description" : "Symfony2 bundle for ChateaClient library, It makes it easy to use API of api.chatea.net",
+	"type" : "symfony-bundle",
+	"authors" : [{
+			"name" : "Xabier Fernández Rodríguez AS jjbier",
+			"email" : "[email protected]",
+			"homepage" : "https://github.com/antwebes",
+			"role" : "Developer"
+		}
+	],
+	"keywords" : [
+		"chatea",
+		"chateagratis",
+		"bundle",
+		"api"
+	],
+	"homepage" : "https://github.com/antwebes/ChateaClientBundle",
+	"license" : "MIT",
+	"require" : {
+		"symfony/framework-bundle" : "~2.3",
+		"antwebes/chatea-common" : "0.1.0",
+		"antwebes/chatea-client-lib" : "0.1.1",
+		"antwebes/chatea-secure-bundle" : "0.1.3",
+		"excelwebzone/recaptcha-bundle": "2.3.*@dev"
+	},
+	"require-dev" : {
+		"raulfraile/ladybug" : "~1.0"
+	},
+	"autoload" : {
+		"psr-0" : {
+			"Ant\\Bundle\\ChateaClientBundle" : ""
+		}
+	},
+	"target-dir" : "Ant/Bundle/ChateaClientBundle"
+}