Commit Graph

230 Commits

Author SHA1 Message Date
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
Dries Vints 554c079988
Merge branch 'master' into develop
# Conflicts:
#	composer.json
2020-10-27 16:19:11 +01:00
Dries Vints b322096379
Merge branch '7.x'
# Conflicts:
#	composer.json
2020-10-27 16:18:44 +01:00
Dries Vints 9b21125e31
Merge branch '6.x' into 7.x
# Conflicts:
#	composer.json
2020-10-27 16:18:17 +01:00
Dries Vints 4c25cb953a
Allow for PHP 8 2020-10-27 16:17:46 +01:00
Dries Vints d1c60201e8
Merge branch 'master' into develop
# Conflicts:
#	composer.json
2020-10-27 15:03:43 +01:00
Dries Vints 8bfecacf8c
Merge branch '7.x'
# Conflicts:
#	composer.json
#	resources/views/welcome.blade.php
2020-10-27 15:02:56 +01:00
Dries Vints 533f130f14
Merge branch '6.x' into 7.x 2020-10-27 15:01:36 +01:00
Dries Vints 3d46fc355d
Update Faker (#5461) 2020-10-27 08:54:45 -05:00
Dries Vints 445ca935c6
[9.x] Allow for composer install on Laravel 9 (#5453)
* Allow for composer install on Laravel 9

* Update composer.json

* Update composer.json

* Update composer.json

Co-authored-by: Taylor Otwell <taylor@laravel.com>
2020-10-22 09:03:11 -05:00
Dries Vints aeec665b75
Update composer.json (#5452) 2020-10-22 07:31:01 -05:00
Dries Vints 232224c5c1
Update composer.json 2020-09-08 17:22:35 +02:00
Graham Campbell 23205e270f Add back in ignition 2020-08-26 11:08:21 +02:00
Dries Vints 48b7ba938e
[8.x] Bump Guzzle (#5381)
* Bump Guzzle

* Update composer.json
2020-08-25 08:27:25 -05:00
Graham Campbell 0512f00664 Set framework version ^7.24 2020-08-07 17:29:43 +01:00
Graham Campbell e96840e206 Set framework version ^6.18.35 2020-08-07 17:28:47 +01:00
Graham Campbell 53d14e51e0
[8.x] PHPUnit 9.3+ style code coverage config (#5368)
* PHPUnit 9.3+ style code coverage config

* Bumped minimum PHPUnit
2020-08-07 09:59:53 -05:00
Dries Vints 0e7fd2beb1
Fix version 2020-07-27 17:59:20 +02:00