Commit Graph

5525 Commits

Author SHA1 Message Date
Graham Campbell 0da4d7db6f Merge branch 'master' into develop 2017-12-18 11:31:05 +00:00
Taylor Otwell 73576f73d6 update deps 2017-12-15 16:24:49 -06:00
Taylor Otwell 3f0e742421
Merge pull request #4504 from hasanemrebeyy/patch-1
Make links HTTPS
2017-12-04 08:17:50 -06:00
Hasan Emre Özer 8640fabc4d
Make links HTTPS 2017-12-04 02:52:48 +03:00
Taylor Otwell 18730bd0da
Merge pull request #4503 from lbausch/patch-1
Remove whitespace
2017-12-03 08:40:51 -06:00
lbausch 83f568a317
Remove whitespace 2017-12-02 23:53:28 +01:00
Taylor Otwell 593963979a
Merge pull request #4493 from m1guelpf-forks/patch-1
Upgrade Vue
2017-11-21 07:37:48 -06:00
Taylor Otwell 19da36d08d
Merge pull request #4494 from m1guelpf-forks/patch-3
Make Vehikl link HTTPS
2017-11-21 07:37:35 -06:00
Miguel Piedrafita 20e8f85919
Make Vehikl link HTTPS 2017-11-20 21:00:18 +01:00
Miguel Piedrafita c2259a2b97
Upgrade Vue 2017-11-20 20:53:53 +01:00
Taylor Otwell 0fd4fb33a2
Merge pull request #4491 from JeremyBellaiche/master
Add sponsor
2017-11-17 07:23:43 -06:00
Unknown cd4e0c2e97 Add sponsor 2017-11-16 23:50:07 +01:00
Taylor Otwell 4a646a0fa0 add sponsor 2017-11-13 08:13:25 -06:00
Taylor Otwell 68772c762c
Merge pull request #4483 from nesk/custom-url-aws
Support custom URLs for AWS storage
2017-11-10 08:19:58 -06:00
Taylor Otwell 411ff5978c
Update filesystems.php 2017-11-10 08:19:10 -06:00
Taylor Otwell be6d4f2ec5 fix 2017-11-10 08:09:05 -06:00
Taylor Otwell 648544a95f fix grammar 2017-11-10 08:02:26 -06:00
Taylor Otwell 0a2daf8f17
Merge pull request #4485 from pranayaryal/patch-2
Removing redundant language
2017-11-10 07:53:54 -06:00
Taylor Otwell df22b3b904
Merge pull request #4486 from astorm/patreon
Fixing Link
2017-11-10 07:53:30 -06:00
Alan Storm 9c72bdf8ab Derp derp wrong link 2017-11-09 18:32:11 -08:00
Pranay Aryal 91d43621e4
Removing redundant language
I hope you mind me remove redundant language just to make it shorter. Thanks.
2017-11-09 16:40:01 -05:00
Johann Pardanaud dfd494f051 Support custom URLs for AWS storage 2017-11-09 20:46:09 +01:00
Taylor Otwell 7231956714
Merge pull request #4482 from astorm/patreon
For Patreon (Alan Storm/Pulse Storm)
2017-11-09 07:49:16 -06:00
Taylor Otwell 985d306fb1
Update readme.md 2017-11-09 07:49:07 -06:00
Alan Storm 763eab1853 For Patreon 2017-11-08 19:56:36 -08:00
Taylor Otwell 01b9061f69
Merge pull request #4476 from gabriel-caruso/package-cross-env
Updated cross-env in package.json
2017-11-01 08:57:45 -05:00
Gabriel Caruso 1603f7804d Updated cross-env in package.json 2017-11-01 08:50:20 -02:00
Taylor Otwell ba96ab0f6e
Merge pull request #4475 from tecpresso/add_sponsor
add sponsor
2017-10-31 11:53:42 -05:00
Tatsunari Sakanoue b69e9d2e1e add sponsor 2017-10-31 23:49:52 +09:00
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