Skip to content

U
UserAdminV2
Commit 76d4c11c by Taylor Otwell
Options

Merge branch 'master' into develop

parents 2f178605 1cf4fb6b
Showing with 8 additions and 7 deletions
app/Console/Commands/Inspire.php
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Foundation\Inspiring; use Illuminate\Foundation\Inspiring;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Input\InputArgument;
class Inspire extends Command { class Inspire extends Command {
......
config/filesystems.php
...@@ -63,6 +63,7 @@ return [ ...@@ -63,6 +63,7 @@ return [
'container' => 'your-container', 'container' => 'your-container',
'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/', 'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/',
'region' => 'IAD', 'region' => 'IAD',
'url_type' => 'publicURL'
], ],
], ],
......
config/queue.php 100755 → 100644
File mode changed from 100755 to 100644
package.json
{ {
"private": true,
"devDependencies": { "devDependencies": {
"gulp": "^3.8.8", "gulp": "^3.8.8",
"laravel-elixir": "*" "laravel-elixir": "*"
......
phpunit.xml
...@@ -18,5 +18,6 @@ ...@@ -18,5 +18,6 @@
<env name="APP_ENV" value="testing"/> <env name="APP_ENV" value="testing"/>
<env name="CACHE_DRIVER" value="array"/> <env name="CACHE_DRIVER" value="array"/>
<env name="SESSION_DRIVER" value="array"/> <env name="SESSION_DRIVER" value="array"/>
<env name="QUEUE_DRIVER" value="sync"/>
</php> </php>
</phpunit> </phpunit>
resources/views/auth/login.blade.php
...@@ -47,11 +47,9 @@ ...@@ -47,11 +47,9 @@
<div class="form-group"> <div class="form-group">
<div class="col-md-6 col-md-offset-4"> <div class="col-md-6 col-md-offset-4">
<button type="submit" class="btn btn-primary" style="margin-right: 15px;"> <button type="submit" class="btn btn-primary">Login</button>
Login
</button>
<a href="/password/email">Forgot Your Password?</a> <a class="btn btn-link" href="/password/email">Forgot Your Password?</a>
</div> </div>
</div> </div>
</form> </form>
......
resources/views/errors/503.blade.php
<html> <html>
<head> <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> <style>
body { body {
......
resources/views/welcome.blade.php
<html> <html>
<head> <head>
<title>Laravel</title>
<link href='//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> <style>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment