From b191604e231e7043bcf95996127d01fa244787b1 Mon Sep 17 00:00:00 2001 From: Michael Boffey Date: Fri, 7 Mar 2014 14:54:38 +0000 Subject: [PATCH 1/5] Updated mail config comments from postmark to mailgun --- app/config/mail.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/mail.php b/app/config/mail.php index a7151a06..30ace8c5 100644 --- a/app/config/mail.php +++ b/app/config/mail.php @@ -24,7 +24,7 @@ | | 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 delivery. | */ @@ -37,7 +37,7 @@ | | 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 application by default. | */ From a2cb6049c9bbbc4a65a07d1827ac7cb5a646fcd4 Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Sat, 8 Mar 2014 15:18:22 -0600 Subject: [PATCH 2/5] Cleaning up comments. --- app/config/mail.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/config/mail.php b/app/config/mail.php index 30ace8c5..29cf84a3 100644 --- a/app/config/mail.php +++ b/app/config/mail.php @@ -24,7 +24,7 @@ | | 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 Mailgun mail service, which will provide reliable delivery. + | the Mailgun mail service which will provide reliable deliveries. | */ @@ -37,7 +37,7 @@ | | 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 Mailgun e-mail application by default. + | stay compatible with the Mailgun e-mail applications by default. | */ From 753370615e820d3be59d002ad77ba6af710776b4 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Sat, 15 Mar 2014 10:14:55 +0000 Subject: [PATCH 3/5] Minor cs fixes --- .gitattributes | 2 +- .gitignore | 2 +- CONTRIBUTING.md | 2 +- app/config/compile.php | 2 +- app/config/mail.php | 2 +- app/config/remote.php | 2 +- app/config/testing/cache.php | 2 +- app/config/testing/session.php | 2 +- app/config/workbench.php | 2 +- app/controllers/BaseController.php | 2 +- app/controllers/HomeController.php | 2 +- app/database/seeds/DatabaseSeeder.php | 2 +- app/filters.php | 2 +- app/lang/en/pagination.php | 4 ++-- app/models/User.php | 2 +- app/routes.php | 2 +- app/tests/ExampleTest.php | 2 +- app/views/emails/auth/reminder.blade.php | 2 +- artisan | 2 +- phpunit.xml | 2 +- public/robots.txt | 2 +- readme.md | 2 +- 22 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.gitattributes b/.gitattributes index 21256661..176a458f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -* text=auto \ No newline at end of file +* text=auto diff --git a/.gitignore b/.gitignore index 59c90b76..3fd564cd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,4 @@ composer.lock .env.local.php .env.php .DS_Store -Thumbs.db \ No newline at end of file +Thumbs.db diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 015febc4..6a780c46 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,3 +1,3 @@ # Contribution Guidelines -Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository! \ No newline at end of file +Please submit all issues and pull requests to the [laravel/framework](http://github.com/laravel/framework) repository! diff --git a/app/config/compile.php b/app/config/compile.php index 54d7185b..d5e55181 100644 --- a/app/config/compile.php +++ b/app/config/compile.php @@ -15,4 +15,4 @@ -); \ No newline at end of file +); diff --git a/app/config/mail.php b/app/config/mail.php index 29cf84a3..41b4c4b4 100644 --- a/app/config/mail.php +++ b/app/config/mail.php @@ -121,4 +121,4 @@ 'pretend' => false, -); \ No newline at end of file +); diff --git a/app/config/remote.php b/app/config/remote.php index ea960e03..2169c434 100644 --- a/app/config/remote.php +++ b/app/config/remote.php @@ -56,4 +56,4 @@ ), -); \ No newline at end of file +); diff --git a/app/config/testing/cache.php b/app/config/testing/cache.php index 16d3ae2f..66a8a39a 100644 --- a/app/config/testing/cache.php +++ b/app/config/testing/cache.php @@ -17,4 +17,4 @@ 'driver' => 'array', -); \ No newline at end of file +); diff --git a/app/config/testing/session.php b/app/config/testing/session.php index a18c1b9f..0364b63d 100644 --- a/app/config/testing/session.php +++ b/app/config/testing/session.php @@ -18,4 +18,4 @@ 'driver' => 'array', -); \ No newline at end of file +); diff --git a/app/config/workbench.php b/app/config/workbench.php index 56bee526..87c5e387 100644 --- a/app/config/workbench.php +++ b/app/config/workbench.php @@ -28,4 +28,4 @@ 'email' => '', -); \ No newline at end of file +); diff --git a/app/controllers/BaseController.php b/app/controllers/BaseController.php index 097e161a..2bee4644 100644 --- a/app/controllers/BaseController.php +++ b/app/controllers/BaseController.php @@ -15,4 +15,4 @@ protected function setupLayout() } } -} \ No newline at end of file +} diff --git a/app/controllers/HomeController.php b/app/controllers/HomeController.php index 796a085e..ede41a7a 100644 --- a/app/controllers/HomeController.php +++ b/app/controllers/HomeController.php @@ -20,4 +20,4 @@ public function showWelcome() return View::make('hello'); } -} \ No newline at end of file +} diff --git a/app/database/seeds/DatabaseSeeder.php b/app/database/seeds/DatabaseSeeder.php index 6a8c204c..19892520 100644 --- a/app/database/seeds/DatabaseSeeder.php +++ b/app/database/seeds/DatabaseSeeder.php @@ -14,4 +14,4 @@ public function run() // $this->call('UserTableSeeder'); } -} \ No newline at end of file +} diff --git a/app/filters.php b/app/filters.php index 85f82c41..2a780f78 100644 --- a/app/filters.php +++ b/app/filters.php @@ -77,4 +77,4 @@ { throw new Illuminate\Session\TokenMismatchException; } -}); \ No newline at end of file +}); diff --git a/app/lang/en/pagination.php b/app/lang/en/pagination.php index eb9be3ba..6b99ef5f 100644 --- a/app/lang/en/pagination.php +++ b/app/lang/en/pagination.php @@ -1,4 +1,4 @@ - 'Next »', -); \ No newline at end of file +); diff --git a/app/models/User.php b/app/models/User.php index 42fe853f..32320505 100644 --- a/app/models/User.php +++ b/app/models/User.php @@ -49,4 +49,4 @@ public function getReminderEmail() return $this->email; } -} \ No newline at end of file +} diff --git a/app/routes.php b/app/routes.php index e2a75e25..3e10dcf5 100644 --- a/app/routes.php +++ b/app/routes.php @@ -14,4 +14,4 @@ Route::get('/', function() { return View::make('hello'); -}); \ No newline at end of file +}); diff --git a/app/tests/ExampleTest.php b/app/tests/ExampleTest.php index ead53e07..62387de1 100644 --- a/app/tests/ExampleTest.php +++ b/app/tests/ExampleTest.php @@ -14,4 +14,4 @@ public function testBasicExample() $this->assertTrue($this->client->getResponse()->isOk()); } -} \ No newline at end of file +} diff --git a/app/views/emails/auth/reminder.blade.php b/app/views/emails/auth/reminder.blade.php index 2976327b..d92f2b3f 100644 --- a/app/views/emails/auth/reminder.blade.php +++ b/app/views/emails/auth/reminder.blade.php @@ -10,4 +10,4 @@ To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}. - \ No newline at end of file + diff --git a/artisan b/artisan index 36bb2d98..ff773ab2 100755 --- a/artisan +++ b/artisan @@ -71,4 +71,4 @@ $status = $artisan->run(); $app->shutdown(); -exit($status); \ No newline at end of file +exit($status); diff --git a/phpunit.xml b/phpunit.xml index c42dc4f7..c3304205 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -15,4 +15,4 @@ ./app/tests/ - \ No newline at end of file + diff --git a/public/robots.txt b/public/robots.txt index 9e60f970..eb053628 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -1,2 +1,2 @@ User-agent: * -Disallow: +Disallow: diff --git a/readme.md b/readme.md index 3a2e4d7b..d1137896 100644 --- a/readme.md +++ b/readme.md @@ -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. From b5d60260fbf7fe1b0592b127dbf4e8082962897f Mon Sep 17 00:00:00 2001 From: "Barry vd. Heuvel" Date: Thu, 3 Apr 2014 14:38:52 +0200 Subject: [PATCH 4/5] Add fallback_locale to config This is implemented in https://github.com/laravel/framework/commit/bf062fee1e0b67b2d646f37a7ef734ea5391c34c --- app/config/app.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/config/app.php b/app/config/app.php index 8fbc6557..d8990379 100644 --- a/app/config/app.php +++ b/app/config/app.php @@ -54,6 +54,19 @@ '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 From 28a95624fe879bcf4d06d69e50a68d9b1f5e895b Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Fri, 11 Apr 2014 16:32:36 -0500 Subject: [PATCH 5/5] Fix wording. --- artisan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artisan b/artisan index 36bb2d98..49bc4f0d 100755 --- a/artisan +++ b/artisan @@ -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. |