Commit Graph

6298 Commits

Author SHA1 Message Date
Dries Vints
0dbc6350b9 Merge branch 'master' into develop 2020-04-09 16:58:04 +02:00
Dries Vints
e2c9261c2d Merge branch '6.x' 2020-04-09 16:56:58 +02:00
Dries Vints
73f723a2f4 Add both endpoint and url env variables (#5276) 2020-04-09 09:54:25 -05:00
Taylor Otwell
f9d2f5be36 remove ignition until its ready for 8 2020-04-08 08:09:49 -05:00
Taylor Otwell
0f0b78ec8c tweak welcome page 2020-04-07 15:58:25 -05:00
Taylor Otwell
bf2d370ec4 new welcome page 2020-04-07 14:38:49 -05:00
Taylor Otwell
2a2522d882 fix wording 2020-03-29 10:38:33 -05:00
Dries Vints
f140d926d3 Merge pull request #5271 from winter-ice/master
[7.x] Consistent filename
2020-03-28 11:57:59 +01:00
ice
b26aaff210 consistent filename 2020-03-28 09:53:47 +08:00
Dries Vints
f2691fcc13 Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
2020-03-24 18:32:52 +01:00
Dries Vints
dccc933416 Update CHANGELOG.md 2020-03-24 18:31:42 +01:00
Dries Vints
d067d7d889 Update CHANGELOG.md 2020-03-24 18:26:16 +01:00
Graham Campbell
1111e6f2f3 Merge branch 'master' into develop 2020-03-24 13:55:29 +00:00
Graham Campbell
6628b7a1b4 Merge branch '6.x' 2020-03-24 13:55:12 +00:00
Jacob Honoré
b7b6e35bf8 Fix s3 endpoint url reference (#5267) 2020-03-24 08:11:36 -05:00
Markus Podar
d82bf9768b [7.x] Allow configuring the timeout for the smtp driver (#5262)
* Allow configuring the timeout for the smtp driver

The default is the same as in `\Swift_Transport_EsmtpTransport::$params`

* Corrected default

* Update mail.php

Co-authored-by: Graham Campbell <GrahamCampbell@users.noreply.github.com>
Co-authored-by: Taylor Otwell <taylor@laravel.com>
2020-03-15 11:25:50 -05:00
Taylor Otwell
52f69fcf25 add sponsor link 2020-03-14 16:07:27 -05:00
Graham Campbell
57cd6a8217 Merge branch 'master' into develop 2020-03-14 11:16:53 +00:00
Mathieu TUDISCO
f93f4ad8bf Fix session config changes (#5261)
* Fix session config changes

* Update session.php

Co-authored-by: Taylor Otwell <taylor@laravel.com>
2020-03-13 14:53:56 -05:00
Barry vd. Heuvel
166abfa35c Update default CORS config (#5259) 2020-03-11 15:08:52 -05:00
André Ricard
c7a0002432 Fix the code indent of object operators (#5258)
This commit fixes the code indent of object operators, as following the framework code standards -> 2.4. Indenting
2020-03-11 07:37:46 -05:00
Roberto Aguilar
b0ce2adc42 Add new SQS queue suffix option (#5252)
As described in laravel/framework#31784, this option will allow to
define a queue name suffix.
2020-03-06 15:16:30 -06:00
Taylor Otwell
641fcfb60a remove config entry 2020-03-06 07:57:18 -06:00
Graham Campbell
404b43b502 Merge branch 'master' into develop 2020-03-06 11:48:48 +00:00
Graham Campbell
36373983ad Merge branch '6.x' 2020-03-06 11:48:34 +00:00
Graham Campbell
5ddbfb8454 Ensure that app.debug is a bool 2020-03-06 11:47:59 +00:00
Taylor Otwell
3aa22403c7 remove empty line from phpunit.xml (#5245)
I'm not sure if there's a style rule for this, but it seems very out of place to be the only empty line in the whole file.
2020-03-04 16:45:31 -06:00
Mark van den Broek
efcf74f422 [7.x] Add Mailgun and Postmark mailer (#5243)
* Add Mailgun and Postmark mailer

* Formatting

* Update mail.php

Co-authored-by: Taylor Otwell <taylor@laravel.com>
2020-03-04 08:05:25 -06:00
Benedikt Franke
c9cf57a00c Add serialize option to array cache config (#5244)
This documents the new configuration option from https://github.com/laravel/framework/pull/31295
2020-03-04 08:04:39 -06:00
Dries Vints
5c4f9980ec Update CHANGELOG.md 2020-03-03 20:43:10 +01:00
Dries Vints
80b250cad6 Merge branch 'master' into develop 2020-03-03 20:42:56 +01:00
Dries Vints
876142d709 Update CHANGELOG.md 2020-03-03 20:42:38 +01:00
Dries Vints
2d7b45bfb4 Merge branch '6.x'
# Conflicts:
#	CHANGELOG.md
2020-03-03 18:18:11 +01:00
Dries Vints
e773d3885b Update CHANGELOG.md 2020-03-03 18:15:59 +01:00
Dries Vints
a29dd2edb8 Update composer.json 2020-03-03 15:02:05 +01:00
Maxime Willinger
672f626da1 Add array mailer (#5240) 2020-03-02 10:52:06 -06:00
Maxime Willinger
7bea49b8ee Use MAIL_MAILER in test environment (#5239) 2020-03-02 09:21:08 -06:00
Dries Vints
d7c602c164 Update app.php (#5237) 2020-02-27 10:30:43 -06:00
Dries Vints
0b14a741eb Update app.php (#5237) 2020-02-27 09:26:30 -06:00
Dries Vints
88a763e36f Update app.php (#5237) 2020-02-27 09:21:15 -06:00
Graham Campbell
705076ffc2 Bumped min guzzle 2020-02-24 14:48:16 +00:00
Graham Campbell
3233e6f809 Merge branch 'master' into develop 2020-02-24 14:47:21 +00:00
Sjors Ottjes
8cece72598 Remove redundant default attributes from phpunit.xml (#5233) 2020-02-24 08:37:15 -06:00
Dries Vints
d529de062d Update composer.json 2020-02-13 16:03:25 +01:00
Dries Vints
d038d1f6b6 Update composer.json 2020-02-13 16:00:10 +01:00
Taylor Otwell
c434eae43d guzzle 2020-02-12 16:20:50 -06:00
Taylor Otwell
6b9050226e use phpunit 0 2020-02-12 09:30:09 -06:00
Taylor Otwell
2c4fa1ab28 formatting 2020-02-05 16:46:09 -06:00
Andrew Brown
d7f67f631d styling 2020-02-05 10:48:51 -06:00
Andrew Brown
153746c2c1 add links option to filesystems config
https://github.com/laravel/framework/pull/31355
2020-02-05 10:33:45 -06:00