From d895d2c972578c8cc18174ca2874074028a85edc Mon Sep 17 00:00:00 2001 From: Andreas Lutro Date: Thu, 31 Oct 2013 15:19:49 +0100 Subject: [PATCH 01/10] added required_without_all --- app/lang/en/validation.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/lang/en/validation.php b/app/lang/en/validation.php index 4fc83ff1..0e2e27d3 100644 --- a/app/lang/en/validation.php +++ b/app/lang/en/validation.php @@ -59,6 +59,7 @@ "required_if" => "The :attribute field is required when :other is :value.", "required_with" => "The :attribute field is required when :values is present.", "required_without" => "The :attribute field is required when :values is not present.", + "required_without_all" => "The :attribute field is required when none of :values are present.", "same" => "The :attribute and :other must match.", "size" => array( "numeric" => "The :attribute must be :size.", From a562593693f0896870bb1c6e87c7950ec440103a Mon Sep 17 00:00:00 2001 From: Andreas Lutro Date: Thu, 31 Oct 2013 15:20:29 +0100 Subject: [PATCH 02/10] shifted alignment --- app/lang/en/validation.php | 70 +++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/app/lang/en/validation.php b/app/lang/en/validation.php index 0e2e27d3..6994232e 100644 --- a/app/lang/en/validation.php +++ b/app/lang/en/validation.php @@ -13,62 +13,62 @@ | */ - "accepted" => "The :attribute must be accepted.", - "active_url" => "The :attribute is not a valid URL.", - "after" => "The :attribute must be a date after :date.", - "alpha" => "The :attribute may only contain letters.", - "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.", - "alpha_num" => "The :attribute may only contain letters and numbers.", - "array" => "The :attribute must be an array.", - "before" => "The :attribute must be a date before :date.", - "between" => array( + "accepted" => "The :attribute must be accepted.", + "active_url" => "The :attribute is not a valid URL.", + "after" => "The :attribute must be a date after :date.", + "alpha" => "The :attribute may only contain letters.", + "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.", + "alpha_num" => "The :attribute may only contain letters and numbers.", + "array" => "The :attribute must be an array.", + "before" => "The :attribute must be a date before :date.", + "between" => array( "numeric" => "The :attribute must be between :min and :max.", "file" => "The :attribute must be between :min and :max kilobytes.", "string" => "The :attribute must be between :min and :max characters.", "array" => "The :attribute must have between :min and :max items.", ), - "confirmed" => "The :attribute confirmation does not match.", - "date" => "The :attribute is not a valid date.", - "date_format" => "The :attribute does not match the format :format.", - "different" => "The :attribute and :other must be different.", - "digits" => "The :attribute must be :digits digits.", - "digits_between" => "The :attribute must be between :min and :max digits.", - "email" => "The :attribute format is invalid.", - "exists" => "The selected :attribute is invalid.", - "image" => "The :attribute must be an image.", - "in" => "The selected :attribute is invalid.", - "integer" => "The :attribute must be an integer.", - "ip" => "The :attribute must be a valid IP address.", - "max" => array( + "confirmed" => "The :attribute confirmation does not match.", + "date" => "The :attribute is not a valid date.", + "date_format" => "The :attribute does not match the format :format.", + "different" => "The :attribute and :other must be different.", + "digits" => "The :attribute must be :digits digits.", + "digits_between" => "The :attribute must be between :min and :max digits.", + "email" => "The :attribute format is invalid.", + "exists" => "The selected :attribute is invalid.", + "image" => "The :attribute must be an image.", + "in" => "The selected :attribute is invalid.", + "integer" => "The :attribute must be an integer.", + "ip" => "The :attribute must be a valid IP address.", + "max" => array( "numeric" => "The :attribute may not be greater than :max.", "file" => "The :attribute may not be greater than :max kilobytes.", "string" => "The :attribute may not be greater than :max characters.", "array" => "The :attribute may not have more than :max items.", ), - "mimes" => "The :attribute must be a file of type: :values.", - "min" => array( + "mimes" => "The :attribute must be a file of type: :values.", + "min" => array( "numeric" => "The :attribute must be at least :min.", "file" => "The :attribute must be at least :min kilobytes.", "string" => "The :attribute must be at least :min characters.", "array" => "The :attribute must have at least :min items.", ), - "not_in" => "The selected :attribute is invalid.", - "numeric" => "The :attribute must be a number.", - "regex" => "The :attribute format is invalid.", - "required" => "The :attribute field is required.", - "required_if" => "The :attribute field is required when :other is :value.", - "required_with" => "The :attribute field is required when :values is present.", - "required_without" => "The :attribute field is required when :values is not present.", + "not_in" => "The selected :attribute is invalid.", + "numeric" => "The :attribute must be a number.", + "regex" => "The :attribute format is invalid.", + "required" => "The :attribute field is required.", + "required_if" => "The :attribute field is required when :other is :value.", + "required_with" => "The :attribute field is required when :values is present.", + "required_without" => "The :attribute field is required when :values is not present.", "required_without_all" => "The :attribute field is required when none of :values are present.", - "same" => "The :attribute and :other must match.", - "size" => array( + "same" => "The :attribute and :other must match.", + "size" => array( "numeric" => "The :attribute must be :size.", "file" => "The :attribute must be :size kilobytes.", "string" => "The :attribute must be :size characters.", "array" => "The :attribute must contain :size items.", ), - "unique" => "The :attribute has already been taken.", - "url" => "The :attribute format is invalid.", + "unique" => "The :attribute has already been taken.", + "url" => "The :attribute format is invalid.", /* |-------------------------------------------------------------------------- From d5c1e8af96e4d1ea7e86418e7fea3f1a2f520baa Mon Sep 17 00:00:00 2001 From: "Euan T." Date: Mon, 16 Dec 2013 15:24:23 +0000 Subject: [PATCH 03/10] Updating .htaccess for consistency Fixing indentation to be consistent --- public/.htaccess | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/public/.htaccess b/public/.htaccess index ea51a317..77827ae7 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -1,14 +1,14 @@ - - Options -MultiViews + + Options -MultiViews RewriteEngine On # Redirect Trailing Slashes... - RewriteRule ^(.*)/$ /$1 [L,R=301] + RewriteRule ^(.*)/$ /$1 [L,R=301] - # Handle Front Controller... + # Handle Front Controller... RewriteCond %{REQUEST_FILENAME} !-d RewriteCond %{REQUEST_FILENAME} !-f RewriteRule ^ index.php [L] From 5f917a6badeec540b55671ece8d1557e499245c1 Mon Sep 17 00:00:00 2001 From: Alexandre Butynski Date: Wed, 5 Feb 2014 14:53:21 +0100 Subject: [PATCH 04/10] Improvement of validation traduction for "email" rule --- app/lang/en/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lang/en/validation.php b/app/lang/en/validation.php index 4c77ee58..7c67d926 100644 --- a/app/lang/en/validation.php +++ b/app/lang/en/validation.php @@ -33,7 +33,7 @@ "different" => "The :attribute and :other must be different.", "digits" => "The :attribute must be :digits digits.", "digits_between" => "The :attribute must be between :min and :max digits.", - "email" => "The :attribute format is invalid.", + "email" => "The :attribute must be a valid email address.", "exists" => "The selected :attribute is invalid.", "image" => "The :attribute must be an image.", "in" => "The selected :attribute is invalid.", From 13e3d4526547d241fa4bd9d1d70e156bf16e2264 Mon Sep 17 00:00:00 2001 From: EvgenyKovalev Date: Wed, 19 Feb 2014 03:24:55 +0300 Subject: [PATCH 05/10] Update queue.php This option is already supported in 'Illuminate/Queue/Connectors/IronConnector.php' Having this option hidden works well only for North America. However for EU having it set to EU servers give 5X boost in network performance with iron.io --- app/config/queue.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/queue.php b/app/config/queue.php index 6c0fa523..78a8c2ff 100644 --- a/app/config/queue.php +++ b/app/config/queue.php @@ -50,6 +50,7 @@ 'iron' => array( 'driver' => 'iron', + 'host' => 'mq-aws-us-east-1.iron.io', 'project' => 'your-project-id', 'token' => 'your-token', 'queue' => 'your-queue-name', From 5b28206c3c10ce3e21a6fa24539f09f355d3a359 Mon Sep 17 00:00:00 2001 From: Ivo Idham Perdameian Date: Thu, 27 Feb 2014 16:00:39 +0700 Subject: [PATCH 06/10] Added required_with_all --- app/lang/en/validation.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/lang/en/validation.php b/app/lang/en/validation.php index 7c67d926..34e96615 100644 --- a/app/lang/en/validation.php +++ b/app/lang/en/validation.php @@ -58,6 +58,7 @@ "required" => "The :attribute field is required.", "required_if" => "The :attribute field is required when :other is :value.", "required_with" => "The :attribute field is required when :values is present.", + "required_with_all" => "The :attribute field is required when all of :values are present.", "required_without" => "The :attribute field is required when :values is not present.", "required_without_all" => "The :attribute field is required when none of :values are present.", "same" => "The :attribute and :other must match.", From a5a8bcbabe626e48e34d843cb11493380fea00fe Mon Sep 17 00:00:00 2001 From: webdrop Date: Fri, 28 Feb 2014 01:44:35 +0300 Subject: [PATCH 07/10] added alt to img tag in hello added required alt tag to img, now successfully passes w3c validation --- app/views/hello.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/hello.php b/app/views/hello.php index d8b85b85..64842421 100644 --- a/app/views/hello.php +++ b/app/views/hello.php @@ -35,7 +35,7 @@
- + Laravel PHP Framework

You have arrived.

From a2574209b3301d9186181f9c3f0f760ae2d82a9d Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 28 Feb 2014 14:50:25 -0600 Subject: [PATCH 08/10] Tweak wording. --- app/lang/en/validation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lang/en/validation.php b/app/lang/en/validation.php index 34e96615..ee9b7f9f 100644 --- a/app/lang/en/validation.php +++ b/app/lang/en/validation.php @@ -58,7 +58,7 @@ "required" => "The :attribute field is required.", "required_if" => "The :attribute field is required when :other is :value.", "required_with" => "The :attribute field is required when :values is present.", - "required_with_all" => "The :attribute field is required when all of :values are present.", + "required_with_all" => "The :attribute field is required when :values is present.", "required_without" => "The :attribute field is required when :values is not present.", "required_without_all" => "The :attribute field is required when none of :values are present.", "same" => "The :attribute and :other must match.", From 36260876ddac4d564241b27afad4bbeac0c32ad3 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 28 Feb 2014 14:58:02 -0600 Subject: [PATCH 09/10] Add sample custom error message. --- app/lang/en/validation.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/lang/en/validation.php b/app/lang/en/validation.php index ee9b7f9f..b03b926c 100644 --- a/app/lang/en/validation.php +++ b/app/lang/en/validation.php @@ -82,7 +82,11 @@ | */ - 'custom' => array(), + 'custom' => array( + 'attribute-name' => array( + 'rule-name' => 'custom-message', + ), + ), /* |-------------------------------------------------------------------------- From 2028ea7aac8646d46bbc5ffeeb7c65713d3e99f0 Mon Sep 17 00:00:00 2001 From: EvgenyKovalev Date: Sat, 1 Mar 2014 01:00:22 +0300 Subject: [PATCH 10/10] Iron.io config less error prone. In iron.io settings 'token' is the first field and 'Project ID' is the second. The proposed order makes it less error prone. --- app/config/queue.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config/queue.php b/app/config/queue.php index 78a8c2ff..16e45bd7 100644 --- a/app/config/queue.php +++ b/app/config/queue.php @@ -51,8 +51,8 @@ 'iron' => array( 'driver' => 'iron', 'host' => 'mq-aws-us-east-1.iron.io', - 'project' => 'your-project-id', 'token' => 'your-token', + 'project' => 'your-project-id', 'queue' => 'your-queue-name', ),