Merge branch 'master' into develop

taylorotwell · taylorotwell · commit d94408d6c17a · 2013-09-06T23:51:46.000-05:00
diff --git a/app/config/auth.php b/app/config/auth.php
@@ -52,11 +52,19 @@
 	| that should be used as your password reminder e-mail. You will also
 	| be able to set the name of the table that holds the reset tokens.
 	|
+	| The "expire" time is the number of minutes that the reminder should be
+	| considered valid. This security feature keeps tokens short-lived so
+	| they have less time to be guessed. You may change this as needed.
+	|
 	*/
 
 	'reminder' => array(
 
-		'email' => 'emails.auth.reminder', 'table' => 'password_reminders',
+		'email' => 'emails.auth.reminder',
+
+		'table' => 'password_reminders',
+
+		'expire' => 60,
 
 	),
 
diff --git a/app/config/session.php b/app/config/session.php
@@ -24,7 +24,7 @@
 	|--------------------------------------------------------------------------
 	|
 	| Here you may specify the number of minutes that you wish the session
-	| to be allowed to remain idle for it is expired. If you want them
+	| to be allowed to remain idle before it expires. If you want them
 	| to immediately expire when the browser closes, set it to zero.
 	|
 	*/
diff --git a/app/lang/en/validation.php b/app/lang/en/validation.php
@@ -19,11 +19,13 @@
 	"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 - :max.",
 		"file"    => "The :attribute must be between :min - :max kilobytes.",
 		"string"  => "The :attribute must be between :min - :max characters.",
+		"array"   => "The :attribute must have between :min - :max items.",
 	),
 	"confirmed"        => "The :attribute confirmation does not match.",
 	"date"             => "The :attribute is not a valid date.",
@@ -41,12 +43,14 @@
 		"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(
 		"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.",
@@ -60,6 +64,7 @@
 		"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.",
diff --git a/composer.json b/composer.json
@@ -2,6 +2,7 @@
 	"name": "laravel/laravel",
 	"description": "The Laravel Framework.",
 	"keywords": ["framework", "laravel"],
+	"license": "MIT",
 	"require": {
 		"laravel/framework": "4.1.*"
 	},

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`\|--------------------------------------------------------------------------`
`25`	`25`	`\|`
`26`	`26`	`\| Here you may specify the number of minutes that you wish the session`
`27`		`- \| to be allowed to remain idle for it is expired. If you want them`
	`27`	`+ \| to be allowed to remain idle before it expires. If you want them`
`28`	`28`	`\| to immediately expire when the browser closes, set it to zero.`
`29`	`29`	`\|`
`30`	`30`	`*/`