316 Commits

Author SHA1 Message Date
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
Taylor Otwell
a7b70fcc31 fix version 2020-07-27 10:57:16 -05:00
Graham Campbell
b1277e2eb2
Bumped laravel 6 min version for new LTS users 2020-07-27 16:23:43 +01:00
rennokki
e9e7c97266
[7.x] Enforce ^7.22.1 due to security issues (#5354)
* enforce ^7.22

* Update composer.json

Co-authored-by: Dries Vints <dries@vints.io>
2020-07-27 10:18:18 -05:00
Nuno Maduro
9374d9e7b3
Requires PHP 7.3 and bumps both PHPUnit and Collision 2020-06-22 03:07:47 +02:00
Dries Vints
a429eab2d4
Merge branch 'master' into develop 2020-06-16 14:56:56 +02:00
Barry vd. Heuvel
2f33300abe
Bump fruitcake/laravel-cors 2020-06-12 08:50:58 +02:00
Taylor Otwell
2149e8c24c update seeders 2020-04-21 14:44:37 -05:00
Taylor Otwell
b9af2b2294 Use new factories
Use the new factories provided in 8.x
2020-04-21 10:12:39 -05:00
Taylor Otwell
f9d2f5be36 remove ignition until its ready for 8 2020-04-08 08:09:49 -05:00
Dries Vints
a29dd2edb8
Update composer.json 2020-03-03 15:02:05 +01: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
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