Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2014-02-28 16:06:05 -06:00
parent c457a93ddb fafb9837dd
commit 0c9aded889
3 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/config/queue.php
View File

@ -50,8 +50,9 @@
'iron' => array( 'iron' => array(
'driver' => 'iron', 'driver' => 'iron',
'project' => 'your-project-id', 'host' => 'mq-aws-us-east-1.iron.io',
'token' => 'your-token', 'token' => 'your-token',
'project' => 'your-project-id',
'queue' => 'your-queue-name', 'queue' => 'your-queue-name',
'encrypt' => true, 'encrypt' => true,
), ),

10
app/lang/en/validation.php
View File

@ -33,7 +33,7 @@
"different" => "The :attribute and :other must be different.", "different" => "The :attribute and :other must be different.",
"digits" => "The :attribute must be :digits digits.", "digits" => "The :attribute must be :digits digits.",
"digits_between" => "The :attribute must be between :min and :max 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.", "exists" => "The selected :attribute is invalid.",
"image" => "The :attribute must be an image.", "image" => "The :attribute must be an image.",
"in" => "The selected :attribute is invalid.", "in" => "The selected :attribute is invalid.",
@ -58,7 +58,9 @@
"required" => "The :attribute field is required.", "required" => "The :attribute field is required.",
"required_if" => "The :attribute field is required when :other is :value.", "required_if" => "The :attribute field is required when :other is :value.",
"required_with" => "The :attribute field is required when :values is present.", "required_with" => "The :attribute field is required when :values is 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" => "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.", "same" => "The :attribute and :other must match.",
"size" => array( "size" => array(
"numeric" => "The :attribute must be :size.", "numeric" => "The :attribute must be :size.",
@ -80,7 +82,11 @@
| |
*/ */
'custom' => array(), 'custom' => array(
'attribute-name' => array(
'rule-name' => 'custom-message',
),
),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

2
app/views/hello.php
View File

File diff suppressed because one or more lines are too long