Merge branch 'master' into develop

2015-02-22 19:58:23 -06:00 · 2015-02-22 19:58:23 -06:00 · 76d4c11c0f
parent 2f1786055d 1cf4fb6bd6
commit 76d4c11c0f
8 changed files with 8 additions and 7 deletions
--- a/app/Console/Commands/Inspire.php
+++ b/app/Console/Commands/Inspire.php
@ -2,8 +2,6 @@

 use Illuminate\Console\Command;
 use Illuminate\Foundation\Inspiring;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;

 class Inspire extends Command {

--- a/config/filesystems.php
+++ b/config/filesystems.php
@ -63,6 +63,7 @@
 			'container' => 'your-container',
 			'endpoint'  => 'https://identity.api.rackspacecloud.com/v2.0/',
 			'region'    => 'IAD',
+			'url_type'  => 'publicURL'
 		],

 	],
--- a/config/queue.php
+++ b/config/queue.php
--- a/package.json
+++ b/package.json
@ -1,4 +1,5 @@
 {
+  "private": true,
  "devDependencies": {
    "gulp": "^3.8.8",
    "laravel-elixir": "*"
--- a/phpunit.xml
+++ b/phpunit.xml
@ -18,5 +18,6 @@
        <env name="APP_ENV" value="testing"/>
        <env name="CACHE_DRIVER" value="array"/>
        <env name="SESSION_DRIVER" value="array"/>
+        <env name="QUEUE_DRIVER" value="sync"/>
    </php>
 </phpunit>
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@ -47,11 +47,9 @@

 						<div class="form-group">
 							<div class="col-md-6 col-md-offset-4">
-								<button type="submit" class="btn btn-primary" style="margin-right: 15px;">
-									Login
-								</button>
+								<button type="submit" class="btn btn-primary">Login</button>

-								<a href="/password/email">Forgot Your Password?</a>
+								<a class="btn btn-link" href="/password/email">Forgot Your Password?</a>
 							</div>
 						</div>
 					</form>
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@ -1,6 +1,6 @@
 <html>
 	<head>
-		<link href='http://fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>
+		<link href='//fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>

 		<style>
 			body {
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@ -1,5 +1,7 @@
 <html>
 	<head>
+		<title>Laravel</title>
+		
 		<link href='//fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>

 		<style>