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 2013-10-30 09:46:39 -05:00
parent 82206d3932 eea4713e7c
commit a373ac8fed
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/config/auth.php
View File

@ -8,7 +8,7 @@
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This option controls the authentication driver that will be utilized. | This option controls the authentication driver that will be utilized.
| This drivers manages the retrieval and authentication of the users | This driver manages the retrieval and authentication of the users
| attempting to get access to protected areas of your application. | attempting to get access to protected areas of your application.
| |
| Supported: "database", "eloquent" | Supported: "database", "eloquent"

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

@ -22,10 +22,10 @@
"array" => "The :attribute must be an array.", "array" => "The :attribute must be an array.",
"before" => "The :attribute must be a date before :date.", "before" => "The :attribute must be a date before :date.",
"between" => array( "between" => array(
"numeric" => "The :attribute must be between :min - :max.", "numeric" => "The :attribute must be between :min and :max.",
"file" => "The :attribute must be between :min - :max kilobytes.", "file" => "The :attribute must be between :min and :max kilobytes.",
"string" => "The :attribute must be between :min - :max characters.", "string" => "The :attribute must be between :min and :max characters.",
"array" => "The :attribute must have between :min - :max items.", "array" => "The :attribute must have between :min and :max items.",
), ),
"confirmed" => "The :attribute confirmation does not match.", "confirmed" => "The :attribute confirmation does not match.",
"date" => "The :attribute is not a valid date.", "date" => "The :attribute is not a valid date.",

2
app/tests/TestCase.php
View File

@ -5,7 +5,7 @@ class TestCase extends Illuminate\Foundation\Testing\TestCase {
/** /**
* Creates the application. * Creates the application.
* *
* @return Symfony\Component\HttpKernel\HttpKernelInterface * @return \Symfony\Component\HttpKernel\HttpKernelInterface
*/ */
public function createApplication() public function createApplication()
{ {

2
bootstrap/start.php
View File

@ -48,7 +48,7 @@
| Load The Application | Load The Application
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here we will load the Illuminate application. We'll keep this is in a | Here we will load this Illuminate application. We will keep this in a
| separate location so we can isolate the creation of an application | separate location so we can isolate the creation of an application
| from the actual running of the application with a given request. | from the actual running of the application with a given request.
| |