Commit Graph

6158 Commits

Author SHA1 Message Date
Caique Castro
312a79f673 Allow filesystem to be changed on config
Allow to change the filesystem storage on the fly.
For example, you can swap the storage disk with a fake one with
Storage::fake for tests.
2017-04-23 14:44:18 -03:00
Taylor Otwell
6869a880b7 adjust wording 2017-04-21 11:39:59 -05:00
Taylor Otwell
743b13d952 Merge branch 'queue-prefix' of https://github.com/browner12/laravel into browner12-queue-prefix 2017-04-21 11:38:41 -05:00
Andrew
d771ee6c8a add queue prefix value
this PR goes along with https://github.com/laravel/framework/pull/18860
2017-04-20 15:31:39 -05:00
Taylor Otwell
49a9f5fd50 Merge pull request #4234 from tillkruss/master
Updated changelog
2017-04-20 12:56:40 -05:00
Till Krüss
47e9da691f Updated changelog 2017-04-20 10:30:29 -07:00
Taylor Otwell
99da499cc8 Merge pull request #4232 from JuanDMeGon/patch-1
Ignore the npm debug log
2017-04-19 07:14:24 -05:00
JuanDMeGon
6b2abec45f Ignore the npm debug log
When an NPM run fails, is created a npm-debug.log file. This file can be ignored and should not be published on a Git based repository.
2017-04-18 20:58:22 -05:00
Taylor Otwell
b699ffabce Merge pull request #4229 from ebuster/patch-1
More clear way to assign middleware in controller
2017-04-18 07:41:14 -05:00
Taylor Otwell
164acc8d7a Merge pull request #4227 from joshmanders/patch-1
Fix break from #4226
2017-04-18 07:25:35 -05:00
Taylor Otwell
100f71e71a fix artisan 2017-04-18 07:24:50 -05:00
Ilya Kudin
9aeef9812a More clear way to assign middleware in controller
Assign guest middleware to LoginController using documented way https://laravel.com/docs/5.4/controllers#controller-middleware 
to avoid confusing with $options array values meaning.
2017-04-18 19:13:35 +07:00
Josh Manders
d00fdbcd1b Fix phpunit. 2017-04-17 17:59:45 -05:00
Josh Manders
dbe787e7ef add LARAVEL_START 2017-04-17 17:56:54 -05:00
Josh Manders
1b99d087ce Fix break from #4226 2017-04-17 17:54:39 -05:00
Taylor Otwell
cae94000ca Merge pull request #4226 from diogoazevedos/develop
Remove extra autoload file
2017-04-17 17:06:12 -05:00
Diogo Azevedo
8914be5fc8 Remove extra autoload file 2017-04-17 18:39:32 -03:00
Taylor Otwell
0be3c212c4 Merge branch 'master' into develop 2017-04-17 15:32:01 -05:00
Taylor Otwell
d905b2e7be only load libraries if present 2017-04-17 15:31:48 -05:00
Taylor Otwell
2f111d54ba Merge branch 'master' into develop 2017-04-17 15:30:50 -05:00
Taylor Otwell
17ec5c51d6 Move the location of Vue inclusion. 2017-04-17 15:30:36 -05:00
Taylor Otwell
c989b23f36 rename trait 2017-04-11 18:37:49 -05:00
Taylor Otwell
8f6a4897a2 remove trait by default 2017-04-11 18:35:46 -05:00
Taylor Otwell
61042a223a Merge remote-tracking branch 'origin/develop' into develop 2017-04-11 18:35:13 -05:00
Taylor Otwell
a536402228 update example test 2017-04-11 18:35:01 -05:00
Taylor Otwell
15f8e2d45e Merge pull request #4219 from laravel/analysis-X0W3an
Apply fixes from StyleCI
2017-04-11 10:43:48 -05:00
Taylor Otwell
c161b14ee0 Apply fixes from StyleCI 2017-04-11 15:43:42 +00:00
Taylor Otwell
67a8a11570 rename ModelFactory to UserFactory to encourage separate files 2017-04-11 10:41:19 -05:00
Taylor Otwell
8abc4d05c5 allow dev installs 2017-04-11 08:16:12 -05:00
Taylor Otwell
bc91dcab93 Merge pull request #4212 from laurencei/patch-1
Add string to validation
2017-04-07 16:44:45 -05:00
Laurence Ioannou
99fca4daef Update RegisterController.php 2017-04-07 21:11:39 +01:00
Taylor Otwell
4696e7bcb6 fix conflicts 2017-04-07 08:11:06 -05:00
Taylor Otwell
c6e3d6e5b4 Merge pull request #4208 from misenhower/fix-axios-defaults
Add to axios defaults instead of overwriting them
2017-04-06 21:13:00 -05:00
Matt Isenhower
0d31e2993b Add to axios defaults instead of overwriting them
This change ensures the default "Accept" header specified by axios is retained.
2017-04-06 15:58:57 -07:00
Taylor Otwell
f7b9a590f9 Merge pull request #4203 from KristofMorva/sort-gitignore
Sorting gitignore file
2017-04-03 15:13:58 -05:00
Taylor Otwell
d870a0c2ce Merge pull request #4204 from mdavis1982/make-app-name-configurable
Make app name configurable in environment file
2017-04-03 15:13:45 -05:00
Matthew Davis
323e553f33 Make app name configurable in environment file 2017-04-03 20:07:41 +01:00
Morva Kristóf
99d4e59d25 Sorting gitignore file 2017-04-03 21:06:10 +02:00
Taylor Otwell
4882961b41 Merge pull request #4196 from DojoGeekRA/patch-1
DRY some npm scripts
2017-03-31 08:05:21 -05:00
Roberto Aguilar
e42ce3eae9 DRY some npm scripts
`dev` and `prod` are just aliases, so this allows to just defer them to their counterparts.

`watch-poll` just adds one extra argument so the special option `--` allows to pass it to the `watch` script.
2017-03-31 00:21:17 -06:00
Taylor Otwell
33c4cab6b7 adjust wording 2017-03-29 10:06:39 -05:00
Taylor Otwell
e23a1d284f add trust proxy middleware 2017-03-29 10:05:16 -05:00
Taylor Otwell
f5fd03d705 Merge pull request #4193 from KristofMorva/npm-windows
NPM scripts should support Windows
2017-03-29 08:14:37 -05:00
Morva Kristóf
3335525431 NPM scripts should support Windows 2017-03-29 11:45:09 +02:00
Taylor Otwell
f16fbd1f8f Merge pull request #4190 from michaeldyrynda/master
Provide consistency with NPM scripts
2017-03-28 07:49:30 -05:00
Taylor Otwell
f5b68b1fc5 Update package.json 2017-03-28 07:49:22 -05:00
Taylor Otwell
7ae5c3fcf8 Merge pull request #4191 from daylerees/add-vagrant-to-ignore
Add vagrant virtual machine directory to git ignore list.
2017-03-28 07:47:36 -05:00
Dayle Rees
a4d1880450 Add vagrant virtual machine directory to git ignore list. 2017-03-28 09:36:45 +01:00
Michael Dyrynda
f19a2f206a Provide consistency with NPM scripts
It trips me up each time that `npm run dev` exists but `npm run prod`
does not. This serves to fix that case, as well as providing consistency
in both directions `dev`/`development` and `prod`/`production`.

[Source](https://twitter.com/michaeldyrynda/status/846507021251690497)
2017-03-28 11:23:08 +10:30
Taylor Otwell
228bc47237 Merge pull request #4186 from tillkruss/patch-1
Added changelog
2017-03-27 11:24:35 -05:00