Commit Graph

247 Commits

Author SHA1 Message Date
Dries Vints
9b4e424d98 Add Ignition (#5764) 2022-01-13 08:48:35 -06:00
Dries Vints
3701593e66 Revert "[9.x] Add Ignition" 2022-01-13 10:34:51 +01:00
Freek Van der Herten
70a8b4a108 Update composer.json 2022-01-12 23:47:13 +01:00
Dries Vints
b58d346ba9 Update composer.json (#5761) 2022-01-12 09:51:03 -06:00
Barry vd. Heuvel
6808b20560 Use latest version of laravel-cors (#5758) 2022-01-03 09:02:45 -06:00
Dries Vints
2b7464fad4 Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
#	composer.json
2021-12-22 11:09:09 +01:00
Dries Vints
e999e1d07c Update composer.json (#5750) 2021-12-15 07:49:21 -06:00
Dries Vints
274d1bdd72 Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-12-07 17:10:58 +01:00
Micheal Mand
e35899f0aa Fix asset publishing if they were already published (#5734)
Thank you @sebdesign for the fix.
2021-11-24 20:07:41 -06:00
Dries Vints
d54907c27d Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
#	composer.json
2021-10-26 17:22:00 +02:00
Nuno Maduro
1980ca13ea [8.x] Logs deprecations instead of treating them as exceptions (#5711)
* Logs deprecations instead of treating them as exceptions

* formatting

Co-authored-by: Taylor Otwell <taylorotwell@gmail.com>
2021-10-19 08:42:24 -05:00
Dries Vints
ab2b606124 Temporarily remove tinker from master
Until 2c061f5bd1 has been re-introduced.
2021-10-11 11:06:14 +02:00
Taylor Otwell
6a68092228 Revert "Uses LazilyRefreshDatabase by default (#5696)" (#5700)
This reverts commit 4578193d52.
2021-10-05 09:23:35 -05:00
Taylor Otwell
bdcb9681a6 fix conflicts 2021-10-02 10:47:56 -05:00
Nuno Maduro
4578193d52 Uses LazilyRefreshDatabase by default (#5696) 2021-09-29 08:20:24 -05:00
Nuno Maduro
ef9d0e4c78 Ensures downloaded version of Collision supports PHP 8.1 (#5697)
Co-authored-by: Taylor Otwell <taylor@laravel.com>
2021-09-29 08:17:58 -05:00
Dries Vints
aa9cb884d2 Bump Mockery and PHPUnit 2021-09-29 11:51:32 +02:00
Dries Vints
6dde1832b4 Sanctum dev-develop 2021-08-12 15:46:34 +02:00
Dries Vints
018bb3c157 Merge branch '8.x'
# Conflicts:
#	composer.json
2021-08-12 15:39:10 +02:00
Taylor Otwell
226d1bfc3c [8.x] Sanctum (#5663)
* initial sanctum poc

* add files

* remove token
2021-08-11 13:44:34 -05:00
Dries Vints
4d0f40f98c Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
#	composer.json
2021-08-10 19:28:02 +02:00
Dries Vints
b6f4ee7661 Use new TrustProxies middleware (#5662) 2021-08-10 08:41:29 -05:00
Dries Vints
7f68c30179 [9.x] Allow develop installs (#5660)
* Allow develop installs

* Disable CORS middleware

* Re-add laravel-cors

* Re-adds collision

Co-authored-by: Nuno Maduro <enunomaduro@gmail.com>
2021-08-09 13:52:42 -05:00
Dries Vints
4c552aefbe Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-08-03 20:13:53 +02:00
Igor Finagin
d286a15b09 [8.x] Unified asset publishing (#5654)
* [8.x] Unified asset publishing

* Update composer.json

Co-authored-by: Taylor Otwell <taylor@laravel.com>
2021-07-29 08:04:43 -05:00
Dries Vints
7c977fb9a5 Drop PHP 7.4 support 2021-07-13 14:59:41 +02:00
netpok
5bd72e7805 Bump framework version (#5601)
to include SQL server security fix for GHSA-4mg9-vhxq-vm7j
2021-04-29 07:55:46 -05:00
Dries Vints
9e920323de Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-03-23 18:26:04 +01:00
Dries Vints
f5cac881c9 Re-order composer.json (#5570) 2021-03-21 08:38:50 -05:00
Dries Vints
bea2c2615b Bump to PHP 7.4 (#5527) 2021-01-28 08:14:34 -06:00
Nuno Maduro
30831ee7be Bumps Collision version (#5517) 2021-01-13 08:04:35 -06:00
Dries Vints
c6059645a6 Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-01-05 16:49:44 +01:00
Ustych Maksym
947df2ac74 Update sail package in the composer.json (#5507) 2021-01-01 12:35:59 -06:00
Dries Vints
501766f1eb Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-12-15 14:18:27 +01:00
Taylor Otwell
17668beabe add sail 2020-12-08 09:51:48 -06:00
Dries Vints
1d1dc13d6b Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-10-30 16:09:57 +01:00
Dries Vints
17778838a4 Bump mockery 2020-10-30 16:06:24 +01:00
Dries Vints
8b947ba34c Merge branch '7.x'
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-10-30 16:05:55 +01:00
Dries Vints
8ae2d8ec1e Bump ignition and collision 2020-10-30 15:53:46 +01:00
Dries Vints
3c4eac92ba Bump Guzzle 2020-10-30 15:48:42 +01:00
Dries Vints
45fa128adb Merge branch '6.x' into 7.x
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-10-30 15:43:30 +01:00
Dries Vints
31fbf612ef Bump fideloper/proxy 2020-10-30 15:39:45 +01:00
Dries Vints
eb34def26a Bump tinker 2020-10-30 15:38:43 +01:00
Dries Vints
d906d7b860 Update phpunit constraints 2020-10-30 15:27:02 +01:00
Dries Vints
f363bc30e1 Bump ignition 2020-10-30 14:59:24 +01:00
Dries Vints
9af70cffa4 Merge branch '6.x' into 7.x
# Conflicts:
#	composer.json
2020-10-29 17:01:22 +01:00
Dries Vints
27338d9a99 Allow PHPUnit 9 2020-10-29 17:00:39 +01:00
Dries Vints
86d4ec095f Update minimum Laravel version 2020-10-29 14:33:24 +01:00
Dries Vints
02ca853809 Nump minimum Laravel version 2020-10-29 14:23:59 +01:00
Dries Vints
b8d582581a Update minimum Laravel version 2020-10-29 14:16:58 +01:00