Commit Graph

5746 Commits

Author SHA1 Message Date
Taylor Otwell 7adc396e9b
Merge pull request #4473 from gabriel-caruso/jquery
Update jquery in package.json
2017-10-30 07:49:18 -05:00
Gabriel Caruso 273a2e76a6 Update jquery in package.json 2017-10-29 22:34:47 -02:00
Taylor Otwell a3eb00e23a
Merge pull request #4472 from nikolaynizruhin/master
Update axios
2017-10-29 08:48:45 -05:00
Nikolay Nizruhin 6c03688d26 Update axios 2017-10-28 19:53:12 +03:00
Taylor Otwell e441d9cac8 Merge pull request #4470 from michaeldyrynda/chore/consistent-aws-env-vars
Update AWS environment variable defaults
2017-10-26 07:17:27 -05:00
Michael Dyrynda f1253690c5 Update AWS environment variable defaults
Aids those users that are using the AWS CLI tools, by matching the `filesystems.disks.s3`
configuration values with those that would be set in a user's native environment already.

AWS Documentation [reference](http://docs.aws.amazon.com/cli/latest/userguide/cli-environment.html)

Resolves laravel/internals#778
2017-10-26 10:44:00 +10:30
Taylor Otwell a4aada88b0 Merge pull request #4467 from michaeldyrynda/master
Don't show progress for production run command
2017-10-24 10:50:39 -05:00
Michael Dyrynda 8b990b27b5 Don't show progress for production run command 2017-10-25 00:07:30 +10:30
Taylor Otwell 3dcea02db6 Merge pull request #4464 from m1guelpf-forks/patch-1
Update Laracasts statistics
2017-10-22 15:52:44 -05:00
Miguel Piedrafita d6cf4ea06d Update Laracasts statistics 2017-10-22 16:13:45 +02:00
Taylor Otwell e6067becd1 Merge pull request #4461 from Gawdl3y/patch-2
Reword the readme slightly and link the email address
2017-10-22 08:52:20 -05:00
Schuyler Cebulskie 4f586a8e1a Slightly reword readme, link email 2017-10-21 15:39:05 -04:00
Taylor Otwell 8f99719dfe Merge pull request #4458 from gabriel-caruso/mockery
[5.5] Match mockery/mockery with laravel/framework
2017-10-16 09:29:05 -05:00
Gabriel Caruso 0d62dfb909 Matche mockery/mockery with laravel/framework 2017-10-16 10:46:16 -02:00
Taylor Otwell da9851055a compile assets 2017-10-09 15:49:15 -05:00
Taylor Otwell 4a86f0765a Merge pull request #4447 from talvbansal/master
Rename example component to follow the vue.js style guide
2017-10-09 15:36:37 -05:00
Talv Bansal 814e0f22e0 Update example component to follow the vue.js style guide 2017-10-09 14:34:20 -04:00
Taylor Otwell 23f6bbe699 Merge pull request #4444 from calebporzio/session-lifetime-in-env
Load session lifetime from env file
2017-10-04 09:01:04 -05:00
Caleb Porzio 084f100045 Load config.session.lifetime from env file 2017-10-04 09:52:03 -04:00
Taylor Otwell 691fdfe1c2 Merge pull request #4433 from ragingdave/patch-1
Update .htaccess
2017-09-26 16:34:29 -05:00
David Cox Jr 8d1d1e1b94 Update .htaccess
This rewrite condition is never hit as the rewrite to index is triggered before this, and the authorization is never passed on. Moving this condition corrects that issue as mentioned on the commit
2017-09-26 13:13:01 -04:00
Taylor Otwell 4bbd5f9be5 Merge pull request #4422 from andrey-helldar/patch-4
Added "-Indexes" option
2017-09-18 14:19:01 -05:00
Andrey Helldar bf59cd3ce1 Added "-Indexes" option
If you open the `/css`, `/js`, or any other folder on the default server, you can see the list of files in the directory.
The `-Indexes` option forbids viewing directory files via the web interface.
2017-09-18 20:42:11 +03:00
Taylor Otwell b96b152998 sponsor 2017-09-18 07:24:16 -05:00
Taylor Otwell 392ece3e4f Merge pull request #4416 from laravel/revert-4413-master
Revert "Use database_path helper for sqlite database filename specified in .env"
2017-09-11 08:04:20 -05:00
Taylor Otwell 80e96d276a Revert "Use database_path helper for sqlite database filename specified in .env" 2017-09-11 08:04:12 -05:00
Taylor Otwell d1cfd416ca Merge pull request #4413 from adrianharabula/master
Use database_path helper for sqlite database filename specified in .env
2017-09-09 23:12:43 +02:00
Adrian Harabula 982e95b5fb use database_path helper for sqlite database filename specified in .env 2017-09-09 21:48:43 +03:00
Taylor Otwell 26a0e8d758 remove sponsor 2017-09-06 10:20:27 -05:00
Taylor Otwell d93c8f177a Merge pull request #4409 from ThunderBirdsX3/master
Update cache prefix.
2017-09-06 14:20:04 +02:00
ThunderbirdsX3 db20630ebf Merge pull request #1 from ThunderBirdsX3/ThunderBirdsX3-patch-1
Update cache prefix.
2017-09-06 16:39:10 +07:00
ThunderbirdsX3 b8120bfb55 Update cache prefix.
Make cache prefix like session cookie.
2017-09-06 16:38:40 +07:00
Till Krüss d5d81a53ed tag v5.5.0 changelog 2017-09-05 19:19:56 -07:00
Taylor Otwell d4c622a0b8 add sponsor 2017-09-05 08:01:13 -05:00
Taylor Otwell a6c68c24c9 fixing conflicts 2017-08-30 11:55:27 +02:00
Taylor Otwell 26eed641eb add sponsor 2017-08-23 12:32:36 -05:00
Taylor Otwell 37d39a7cf5 Merge pull request #4383 from scrubmx/patch-8
Fix in comment in config/app.php
2017-08-18 08:00:12 -05:00
Jorge González 601b665ba3 Fix in comment in config/app.php
I know it is a small thing but it's driving me crazy!
2017-08-17 23:47:12 -05:00
Taylor Otwell d0ad72226e Merge pull request #4375 from decadence/patch-1
require_once /vendor/autoload.php
2017-08-15 08:24:34 -05:00
Victor Isadov c5a4ed0424 Update autoload.php 2017-08-15 11:18:39 +03:00
Taylor Otwell af2a4d47a3 Merge pull request #4374 from ikari7789/patch-1
Change indent for package.json from 2 to 4 spaces
2017-08-14 09:09:35 -05:00
Andrew Miller 0baa2e7794 Change indent for package.json from 2 to 4 spaces
Minor style issue more than anything.

If using `php artisan preset` it will use PHP's `JSON_PRETTY_PRINT` to rewrite the file (https://github.com/laravel/framework/blob/master/src/Illuminate/Foundation/Console/Presets/Preset.php#L44). `JSON_PRETTY_PRINT` uses four spaces for indentation, causing the entire file contents to be altered upon a diff.

Rather than adding logic to change the indentation after executing `json_encode()` in `Illuminate\Foundation\Console\Presets\Preset`, it seems easier to just fix the default indentation in `package.json`. NPM doesn't seem to change the spacing at all, so this seems like a happy medium.
2017-08-14 22:34:23 +09:00
Taylor Otwell 58ed5459b1 Merge pull request #4373 from marcusmoore/patch-2
update example unit test to use RefreshDatabase trait
2017-08-12 20:43:56 -05:00
Marcus Moore faa3d2fa34 update example unit test to use RefreshDatabase trait 2017-08-12 18:21:49 -07:00
Taylor Otwell bee41ce20b Merge pull request #4368 from keving91/patch-1
Fixes "Cannot resolve directory'" in PhpStorm
2017-08-12 15:35:39 -05:00
Kevin G 0657a2ba25 Fixes "Cannot resolve directory'" in PhpStorm
This fixes the annoying error shown on the import line

Cannot resolve directory 'node_modules' less... (Strg+F1) 
This inspection checks references to files and directories.
2017-08-11 17:13:08 +02:00
Taylor Otwell be143bf2dc Merge pull request #4364 from tomirons/patch-1
[5.5] add whoops to dev dependencies
2017-08-06 08:50:48 -05:00
Tom Irons c542d0ba3d add whoops to dev dependencies 2017-08-05 15:55:03 -04:00
Taylor Otwell a1ee424ac7 add sponsor 2017-08-01 12:15:51 -05:00
Taylor Otwell 8a50ccb617 Merge pull request #4350 from Te7a-Houdini/AddAuthDirective
Add auth directive
2017-07-25 22:27:56 -04:00