Commit Graph
93 Commits
Author SHA1 Message Date
Dries Vints c6059645a6 Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2021-01-05 16:49:44 +01:00
Dries Vints f9f39ee7ac Update CHANGELOG.md 2021-01-05 16:48:16 +01:00
Dries Vints b1c8ffa1b0 Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-12-22 18:08:32 +01:00
Dries Vints 454f0e1abe Update CHANGELOG.md 2020-12-22 18:07:44 +01:00
Dries Vints 501766f1eb Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-12-15 14:18:27 +01:00
Dries Vints 0059fb91be Update CHANGELOG.md 2020-12-15 14:17:57 +01:00
Dries Vints 858b094b62 Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-12-01 16:30:52 +01:00
Dries Vints 0717bb0291 Update CHANGELOG.md 2020-12-01 16:21:29 +01:00
Dries Vints d4cf3e2c71 Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-11-24 18:21:08 +01:00
Dries Vints 86b1b3f20a Update CHANGELOG.md 2020-11-24 18:18:56 +01:00
Dries Vints e253d4ebb9 Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-11-17 17:41:01 +01:00
Dries Vints e8498122a2 Update CHANGELOG.md 2020-11-17 17:40:17 +01:00
Dries Vints e4517a8951 Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-11-10 15:58:52 +01:00
Dries Vints 3d7a5075e7 Update CHANGELOG.md 2020-11-10 15:57:51 +01:00
Dries Vints 1aa50f0e4c Merge branch '8.x'
# Conflicts:
#	CHANGELOG.md
2020-11-03 20:02:43 +01:00
Dries Vints d9e85605cb Update CHANGELOG.md 2020-11-03 20:02:19 +01:00
Dries Vints c31edfe4f0 Merge branch 'master' into develop 2020-10-31 10:21:22 +01:00
Dries Vints efdde1e928 Merge branch '7.x'
# Conflicts:
#	CHANGELOG.md
2020-10-31 10:21:07 +01:00
Dries Vints 3923e7f7c4 Update CHANGELOG.md 2020-10-31 10:17:45 +01:00
Dries Vints ff35597347 Lower ignition constraint 2020-10-31 10:16:23 +01:00
Dries Vints 1d1dc13d6b Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-10-30 16:09:57 +01:00
Dries Vints 3e9fd59156 Update CHANGELOG.md 2020-10-30 16:07:53 +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 509708c7ee Update CHANGELOG.md 2020-10-30 16:03:50 +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 d85be86698 Update CHANGELOG.md 2020-10-30 15:40:46 +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 fc79b8bb11 Merge branch '7.x'
# Conflicts:
#	composer.json
2020-10-29 17:01:55 +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 0d5d51fb5d Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-10-29 14:35:38 +01:00
Dries Vints 4966dd9baf Update CHANGELOG.md 2020-10-29 14:33:50 +01:00
Dries Vints 86d4ec095f Update minimum Laravel version 2020-10-29 14:33:24 +01:00
Dries Vints 2460441818 Merge branch '7.x'
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-10-29 14:32:54 +01:00
Dries Vints 482d68a182 Update CHANGELOG.md 2020-10-29 14:26:10 +01:00
Dries Vints 02ca853809 Nump minimum Laravel version 2020-10-29 14:23:59 +01:00
Dries Vints 056a9e8f90 Merge branch '6.x' into 7.x
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-10-29 14:23:32 +01:00
Dries Vints aef279a6cf Update CHANGELOG.md 2020-10-29 14:17:39 +01:00
Dries Vints b8d582581a Update minimum Laravel version 2020-10-29 14:16:58 +01:00
Dries Vints a4d45e6940 Update CHANGELOG.md 2020-10-29 14:15:43 +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 22fa816fdf Delete removed webpack flag (#5460) 2020-10-27 08:11:46 -05:00
Dries VintsandTaylor Otwell 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 <[email protected]>
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 71c6571fc8 Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
2020-10-20 20:34:45 +02:00
Dries Vints d82d7505a1 Update CHANGELOG.md 2020-10-20 20:34:02 +02:00
Dries Vints 13668dd89f Update CHANGELOG.md 2020-10-06 18:12:53 +02:00
Dries Vints 1e29cf351f Merge branch 'master' into develop 2020-10-06 18:12:27 +02:00
Dries Vints c66546e75f Update CHANGELOG.md 2020-10-06 18:11:27 +02:00
Dries Vints f5161080d4 Update CHANGELOG.md 2020-10-06 18:08:05 +02:00
Dries Vints 6a9d5e0da1 Merge branch '7.x' into master
# Conflicts:
#	CHANGELOG.md
2020-09-21 18:12:33 +02:00
Dries Vints 4eeb29ee12 Update changelog 2020-09-21 17:59:16 +02:00
Dries Vints 232224c5c1 Update composer.json 2020-09-08 17:22:35 +02:00
Dries Vints 151e11cacc Merge branch 'master' into develop
# Conflicts:
#	app/Exceptions/Handler.php
2020-09-08 13:28:32 +02:00
Dries Vints a7a40d7744 Merge branch '6.x' into master 2020-09-08 13:28:00 +02:00
Dries Vints 179e52bdd7 Fix logo 2020-09-08 13:27:47 +02:00
Dries Vints dc5817bbf2 Update Handler.php 2020-09-04 10:39:28 +02:00
Dries Vints 48b7ba938e [8.x] Bump Guzzle (#5381)
* Bump Guzzle

* Update composer.json
2020-08-25 08:27:25 -05:00
Dries Vints 57cc899099 Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
#	composer.json
2020-08-11 19:45:48 +02:00
Dries Vints fa43c0a333 Update CHANGELOG.md 2020-08-11 19:44:47 +02:00
Dries Vints 921b14b954 Update CHANGELOG.md 2020-08-11 19:16:01 +02:00
Dries Vints 39a58710ba Merge pull request #5370 from laravel/bump-7
[7.x] Set framework version ^7.24
2020-08-07 20:08:41 +02:00
Dries Vints bbd3616715 Merge pull request #5369 from laravel/bump-6
[6.x] Set framework version ^6.18.35
2020-08-07 20:07:55 +02:00
Dries Vints 0e7fd2beb1 Fix version 2020-07-27 17:59:20 +02:00
Dries Vints 074c3840ff Merge pull request #5355 from laravel/bump
[6.x] Bumped laravel 6 min version for new LTS users
2020-07-27 17:34:05 +02:00
Dries Vints 2053375853 Merge branch 'master' into develop 2020-07-20 16:17:05 +02:00
Dries Vints 6d9296c71e Merge pull request #5346 from ahinkle/patch-1
Bump lodash from 4.17.13 to 4.17.19
2020-07-20 16:15:08 +02:00
Dries Vints 17e2ce73ed Merge pull request #5324 from nunomaduro/patch-1
[8.x] Requires PHP 7.3 and bumps both PHPUnit and Collision
2020-06-22 10:18:42 +02:00
Dries Vints a429eab2d4 Merge branch 'master' into develop 2020-06-16 14:56:56 +02:00
Dries Vints 74df1e26e6 Merge pull request #5320 from barryvdh/patch-4
Bump fruitcake/laravel-cors
2020-06-12 10:36:11 +02:00
Dries Vints eb080e5cee Merge branch 'master' into develop 2020-04-27 16:33:05 +02:00
Dries Vints 785405b34b Merge branch '6.x' 2020-04-27 16:32:54 +02:00
Dries Vints 919a04914f Merge branch 'master' into develop 2020-04-16 09:47:44 +02:00
Dries Vints 3cdfe0ce95 Merge branch '6.x'
# Conflicts:
#	CHANGELOG.md
2020-04-16 09:47:28 +02:00
Dries Vints 8aab222c12 Update CHANGELOG.md 2020-04-16 09:45:26 +02:00
Dries Vints 8be1fd4001 Merge branch 'master' into develop
# Conflicts:
#	CHANGELOG.md
2020-04-15 13:47:54 +02:00
Dries Vints b5f008a8bf Update CHANGELOG.md 2020-04-15 13:46:52 +02:00
Dries Vints 103fc0b451 Merge pull request #5278 from voyula/patch-1
[7.x] Normalize Style
2020-04-14 10:58:32 +02:00
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