Commit Graph

5217 Commits

Author SHA1 Message Date
Taylor Otwell 3437566d66 Merge pull request #4008 from vinkla/patch-1
Remove unnecessary .gitkeep
2016-10-17 09:25:59 -05:00
Vincent Klaiber 1d8dcad342 Remove .gitkeep in migrations directory 2016-10-17 16:04:12 +02:00
Vincent Klaiber 0d2a2e3375 Remove .gitkeep in seeds directory 2016-10-17 16:03:51 +02:00
Taylor Otwell fdef1b6fbe Merge pull request #4007 from vinkla/patch-1
Use fullpath for validator facade
2016-10-17 09:00:25 -05:00
Taylor Otwell 5b7810680d Merge pull request #4001 from RonMelkhior/master
Add redirectTo attribute to the reset password controller
2016-10-17 08:59:26 -05:00
Vincent Klaiber 6325610070 Use fullpath for validator facade
Added fullpath import for the validator facade.
2016-10-17 15:55:26 +02:00
Graham Campbell 7a851c75d9 Merge pull request #4005 from carlosmtrinidad/master
Remove space in _variables.scss
2016-10-17 09:21:02 +01:00
Carlos M. Trinidad 6e8d629ec0 Remove space in _variables.scss 2016-10-16 16:53:26 -05:00
Taylor Otwell 1905c965eb Merge pull request #4004 from diogoazevedos/schema-drop
Use dropIfExists instead of drop
2016-10-16 15:06:04 -05:00
Diogo Azevedo 3ecc0e39ed Use dropIfExists instead of drop 2016-10-16 14:34:56 -02:00
Ron Melkhior 6b73fae8d7 Add redirectTo attribute to the reset password controller 2016-10-16 03:44:24 +03:00
Taylor Otwell 472d6ae508 Merge pull request #4000 from zaknes/master
Add home link to welcome page
2016-10-14 21:12:18 -05:00
Zak Nesler d0fa3fcba6 Added home link to welcome page 2016-10-14 17:27:22 -04:00
Taylor Otwell 38ba3280cc Merge pull request #3996 from jehadassaf/patch-1
Ignore Passport-generated OAuth keys
2016-10-12 10:16:51 -05:00
Jehad Assaf f7a79a33cf Ignore Passport-generated OAuth keys
These files should not end up in source control IMO. And even though Passport is a separate package it is a first-party one and the base Laravel install should be "prepared" for it.

What do you guys think?
2016-10-12 15:51:50 +03:00
Taylor Otwell 5dc817bf55 Merge pull request #3994 from craigpaul/master
Updates laravel-elixir version for vue 2 compatibility
2016-10-11 13:59:34 -05:00
Craig Paul d28866294b Updates laravel-elixir version for vue 2 compatibility 2016-10-11 12:12:01 -06:00
Taylor Otwell 992aad03b0 Merge remote-tracking branch 'origin/master' 2016-10-10 07:56:51 -05:00
Taylor Otwell ed9a82d6cc fix comment 2016-10-10 07:56:44 -05:00
Taylor Otwell a2df28face Merge pull request #3988 from arcanedev-maroc/patch-1
Fixing typehint
2016-10-07 19:48:55 -05:00
ARCANEDEV f699e710ad Fixing typehint 2016-10-07 23:31:23 +01:00
Taylor Otwell a37215d044 fix spacing 2016-10-07 16:39:42 -05:00
Taylor Otwell 421b210a77 Merge pull request #3987 from barryvdh/patch-2
Add typehint for Factory
2016-10-07 16:39:08 -05:00
Barry vd. Heuvel 93e078a79d Add typehint for Factory 2016-10-07 15:08:41 +02:00
Erik Telford e0573e67e0 Use mounted instead of ready 2016-10-02 21:33:52 -05:00
Erik Telford 6f9a450f5c Bind to #app instead of body 2016-10-02 21:33:42 -05:00
Erik Telford 1117be09e7 Use vue 2 and elixir-vue-2 2016-10-02 21:33:25 -05:00
Taylor Otwell d880fb5f85 no need for env 2016-09-22 12:26:13 -05:00
Taylor Otwell f4606d2bb9 Merge pull request #3957 from WayneHarris/vue-resource
Update Vue Resource
2016-09-22 10:06:36 -05:00
Wayne Harris 76db1006cc Update Vue Resource
Propose updating Vue Resource.

Will require changing the way the X-CSRF-TOKEN header in bootstrap.js

This seems to be compatible with Larval Passport
2016-09-22 10:36:43 +01:00
Till Krüss 54ee465deb Added `database.redis.client` configuration 2016-09-21 13:34:46 -07:00
Taylor Otwell 4eeec60d7a Merge remote-tracking branch 'origin/master' 2016-09-20 08:38:51 -05:00
Taylor Otwell a80e5bca0b add bus alias 2016-09-20 08:38:45 -05:00
Taylor Otwell f777e894d9 Merge pull request #3951 from krienow/patch-d57d11
Add unique modifier
2016-09-20 08:28:29 -05:00
Kai Rienow dcf971805d Add unique modifier 2016-09-20 08:23:40 +02:00
Taylor Otwell 49a48100a7 different default name 2016-09-14 09:57:39 -05:00
Taylor Otwell 65e73f38cb Merge branch 'develop' 2016-09-14 09:57:21 -05:00
Taylor Otwell 93d92bbb9e Merge pull request #3942 from ramondj/patch-1
Rename variables.scss to _variables.scss
2016-09-14 08:15:03 -05:00
Ramon d829d7553e Rename variables.scss to _variables.scss
We don't need variables.scss to be compiled into CSS, because it's being imported into app.scss (and get's compiled there). Added an underscore so the Sass compiler ignores this file, which is a common practice with Sass partials (see http://sass-lang.com/guide @ Partials).
2016-09-14 11:19:50 +02:00
Taylor Otwell 31fce5c503 change wording 2016-09-06 20:49:16 -05:00
Francisco Daniel 30d0e2dcca fix comments 2016-09-06 17:39:17 -05:00
Taylor Otwell 7f06559971 Merge pull request #3929 from bryceadams/patch-map-api-before-web
[5.3] Map API routes before Web routes
2016-09-05 09:41:38 -05:00
Bryce Adams 78f4e85f74 Map API routes before Web routes 2016-09-05 20:54:21 +10:00
Taylor Otwell 7da6edf8c1 working on message 2016-09-02 08:48:07 -05:00
Mohamed Said 1562407562 add langiage line for uploaded validation rule 2016-09-02 15:41:18 +02:00
Taylor Otwell a4b53b394c Merge pull request #3922 from jasonmccreary/https-only-cookie-env
Environment configuration for HTTPS only cookie
2016-09-02 07:53:55 -05:00
Taylor Otwell a70dd5622b Merge pull request #3923 from fernandobandeira/patch-1
Lang Alphabetical Order
2016-09-02 07:37:19 -05:00
Fernando Henrique Bandeira dd1e64a7a4 Changing order 2016-09-02 08:39:34 -03:00
Jason McCreary 41b0560375 Environment configuration for HTTPS only cookie 2016-09-01 21:22:34 -04:00
Taylor Otwell c92c724dbf Merge pull request #3921 from jackmu95/add-mimetypes-translation
Add missing translation for `mimetypes` validation
2016-09-01 13:21:39 -05:00