ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Taylor Otwell
2014-04-11 17:17:20 -05:00
parent c7dff13401 cb21cb8aa8
commit 211dfc24e7
23 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -1 +1 @@
* text=auto
* text=auto

2
.gitignore vendored
View File

@@ -5,4 +5,4 @@ composer.lock
.env.local.php
.env.php
.DS_Store
Thumbs.db
Thumbs.db

2
CONTRIBUTING.md
View File

@@ -1,3 +1,3 @@
# Contribution Guidelines
Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!
Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository!

13
app/config/app.php
View File

@@ -54,6 +54,19 @@ return array(
'locale' => 'en',
/*
|--------------------------------------------------------------------------
| Application Fallback Locale
|--------------------------------------------------------------------------
|
| The fallback locale determines the locale to use when the current one
| is not available. You may change the value to correspond to any of
| the language folders that are provided through your application.
|
*/
'fallback_locale' => 'en',
/*
|--------------------------------------------------------------------------
| Encryption Key

2
app/config/compile.php
View File

@@ -15,4 +15,4 @@ return array(
);
);

4
app/config/mail.php
View File

@@ -24,7 +24,7 @@ return array(
|
| Here you may provide the host address of the SMTP server used by your
| applications. A default option is provided that is compatible with
| the Postmark mail service, which will provide reliable delivery.
| the Mailgun mail service which will provide reliable deliveries.
|
*/
@@ -37,7 +37,7 @@ return array(
|
| This is the SMTP port used by your application to delivery e-mails to
| users of your application. Like the host we have set this value to
| stay compatible with the Postmark e-mail application by default.
| stay compatible with the Mailgun e-mail applications by default.
|
*/

2
app/config/remote.php
View File

@@ -56,4 +56,4 @@ return array(
),
);
);

2
app/config/testing/cache.php
View File

@@ -17,4 +17,4 @@ return array(
'driver' => 'array',
);
);

2
app/config/testing/session.php
View File

@@ -18,4 +18,4 @@ return array(
'driver' => 'array',
);
);

2
app/config/workbench.php
View File

@@ -28,4 +28,4 @@ return array(
'email' => '',
);
);

2
app/controllers/BaseController.php
View File

@@ -15,4 +15,4 @@ class BaseController extends Controller {
}
}
}
}

2
app/controllers/HomeController.php
View File

@@ -20,4 +20,4 @@ class HomeController extends BaseController {
return View::make('hello');
}
}
}

2
app/database/seeds/DatabaseSeeder.php
View File

@@ -14,4 +14,4 @@ class DatabaseSeeder extends Seeder {
// $this->call('UserTableSeeder');
}
}
}

2
app/filters.php
View File

@@ -87,4 +87,4 @@ Route::filter('csrf', function()
{
throw new Illuminate\Session\TokenMismatchException;
}
});
});

4
app/lang/en/pagination.php
View File

@@ -1,4 +1,4 @@
<?php
<?php
return array(
@@ -17,4 +17,4 @@ return array(
'next' => 'Next &raquo;',
);
);

2
app/models/User.php
View File

@@ -49,4 +49,4 @@ class User extends Eloquent implements UserInterface, RemindableInterface {
return $this->email;
}
}
}

2
app/routes.php
View File

@@ -14,4 +14,4 @@
Route::get('/', function()
{
return View::make('hello');
});
});

2
app/tests/ExampleTest.php
View File

@@ -14,4 +14,4 @@ class ExampleTest extends TestCase {
$this->assertTrue($this->client->getResponse()->isOk());
}
}
}

2
app/views/emails/auth/reminder.blade.php
View File

@@ -10,4 +10,4 @@
To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}.
</div>
</body>
</html>
</html>

4
artisan
View File

@@ -21,7 +21,7 @@ require __DIR__.'/bootstrap/autoload.php';
|--------------------------------------------------------------------------
|
| We need to illuminate PHP development, so let's turn on the lights.
| This bootstrap the framework and gets it ready for use, then it
| This bootstraps the framework and gets it ready for and then it
| will load up this application so that we can run it and send
| the responses back to the browser and delight these users.
|
@@ -71,4 +71,4 @@ $status = $artisan->run();
$app->shutdown();
exit($status);
exit($status);

2
phpunit.xml
View File

@@ -15,4 +15,4 @@
<directory>./app/tests/</directory>
</testsuite>
</testsuites>
</phpunit>
</phpunit>

2
public/robots.txt
View File

@@ -1,2 +1,2 @@
User-agent: *
Disallow:
Disallow:

2
readme.md
View File

@@ -1,6 +1,6 @@
## Laravel PHP Framework
[![Latest Stable Version](https://poser.pugx.org/laravel/framework/version.png)](https://packagist.org/packages/laravel/framework) [![Total Downloads](https://poser.pugx.org/laravel/framework/d/total.png)](https://packagist.org/packages/laravel/framework) [![Build Status](https://travis-ci.org/laravel/framework.png)](https://travis-ci.org/laravel/framework) [![License](https://poser.pugx.org/laravel/framework/license.png)](https://packagist.org/packages/laravel/framework)
[![Latest Stable Version](https://poser.pugx.org/laravel/framework/version.png)](https://packagist.org/packages/laravel/framework) [![Total Downloads](https://poser.pugx.org/laravel/framework/d/total.png)](https://packagist.org/packages/laravel/framework) [![Build Status](https://travis-ci.org/laravel/framework.png)](https://travis-ci.org/laravel/framework) [![License](https://poser.pugx.org/laravel/framework/license.png)](https://packagist.org/packages/laravel/framework)
Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable, creative experience to be truly fulfilling. Laravel attempts to take the pain out of development by easing common tasks used in the majority of web projects, such as authentication, routing, sessions, and caching.