David A. Windham
david
/
laravel
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' into develop

Taylor Otwell 9 years ago
parent
2f1786055d 1cf4fb6bd6
commit
76d4c11c0f
7 changed files with 8 additions and 7 deletions
Split View Show Diff Stats
  1. 0 2
      app/Console/Commands/Inspire.php
  2. 1 0
      config/filesystems.php
  3. 1 0
      config/queue.php
  4. 1 0
      phpunit.xml
  5. 2 4
      resources/views/auth/login.blade.php
  6. 1 1
      resources/views/errors/503.blade.php
  7. 2 0
      resources/views/welcome.blade.php

+ 0 - 2
app/Console/Commands/Inspire.php
View File 

@@ -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 {

+ 1 - 0
config/filesystems.php
View File 

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

+ 1 - 0
config/queue.php
View File 

@@ -1,4 +1,5 @@
 
 {
 
+  "private": true,
 
   "devDependencies": {
 
     "gulp": "^3.8.8",
 
     "laravel-elixir": "*"

+ 1 - 0
phpunit.xml
View File 

@@ -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>

+ 2 - 4
resources/views/auth/login.blade.php
View File 

@@ -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>

+ 1 - 1
resources/views/errors/503.blade.php
View File 

@@ -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 {

+ 2 - 0
resources/views/welcome.blade.php
View File 

@@ -1,5 +1,7 @@
 
 <html>
 
 	<head>
 
+		<title>Laravel</title>
 
+		
 		<link href='//fonts.googleapis.com/css?family=Lato:100' rel='stylesheet' type='text/css'>
 
 
 		<style>