Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,482 Commits 2 Branches 0 Tags 14 MiB
Commit Graph

6482 Commits

Author SHA1 Message Date
Dries Vints 828f2d4401
Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2021-02-16 17:59:48 +01:00
Dries Vints 689c0e5a23
Update CHANGELOG.md 2021-02-16 17:57:31 +01:00
Taylor Otwell 698a61d025 Merge branch '8.x' of github.com:laravel/laravel into 8.x 2021-02-16 08:02:15 -06:00
Taylor Otwell 9a56a60cc9 update wording 2021-02-16 08:02:06 -06:00
Taylor Otwell 22626b5701
Revert "Change "Login" text to "Log in" (#5536)" (#5537) 
This reverts commit cbddb27c7e.
 2021-02-15 15:06:50 -06:00
Mark Jaquith cbddb27c7e
Change "Login" text to "Log in" (#5536) 
As this is used as a verb, like its friend "Register", the verb form should be used.

http://notaverb.com/login
 2021-02-15 15:06:24 -06:00
Jared Lewis eaf7289523
Add unverified state to UserFactory (#5533) 2021-02-09 14:52:23 -06:00
Khaled 6d082c81e5
add "ably" in comment as a broadcast connection (#5531) 
'ably' was added in the connections array, but the comment was not updated to reflect this fact.
 2021-02-06 18:35:22 -06:00
Govar Jabar c1b56831df
update web.config (#5528) 2021-01-29 07:57:50 -06:00
Dries Vints bea2c2615b
Bump to PHP 7.4 (#5527) 2021-01-28 08:14:34 -06:00
Dries Vints 6d3e5ed928
Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
#	docker-compose.yml
 2021-01-19 16:22:05 +01:00
Dries Vints a96fe93207
Update CHANGELOG.md 2021-01-19 16:20:53 +01:00
Dries Vints b580fc1ef2
Delete docker-compose.yml (#5522) 2021-01-15 10:24:56 -06:00
Kacper Ziubryniewicz 21c0aed802
Add a missing dot in translations (#5520) 2021-01-14 16:27:55 -06:00
Nuno Maduro 30831ee7be
Bumps Collision version (#5517) 2021-01-13 08:04:35 -06:00
Alessandro Cabutto 31a4fc998b
Mailhog's forward ports configurable (#5518) 
To avoid port clash between different projects running on the same machine, it could be useful making mailhog's port configurable.
 2021-01-13 08:02:26 -06:00
Taylor Otwell 5dd08043a3 wip 2021-01-12 14:02:00 -06:00
Gemma Black ea7de4f5a9
Hide .env.bak as well as .env.backup in .gitignore (#5515) 2021-01-12 12:51:19 -06:00
Dries Vints cdd79ce5cf
Update CHANGELOG.md 2021-01-12 18:39:43 +01:00
Dries Vints f97e551071
Update TrustProxies.php (#5514) 2021-01-12 11:18:35 -06:00
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
RobTables 4de728e78c Update to package.json - Axios Version 
Security Vulnerability: https://www.npmjs.com/advisories/1594
 2021-01-05 10:16:40 +01:00
Jeffrey Way eeb91d4546
Upgrade to Mix v6 (#5505) 
* Upgrade to Mix v6

* Remove cross-env
 2021-01-04 08:44:16 -06:00
Ustych Maksym 947df2ac74
Update sail package in the composer.json (#5507) 2021-01-01 12:35:59 -06:00
Taylor Otwell 919ea4ceb2 update tests 2020-12-28 17:06:01 -06:00
Taylor Otwell 7a2f389f58 Merge branch 'master' of github.com:laravel/laravel 2020-12-28 17:04:55 -06: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
Taylor Otwell e8788a7688 update cache 2020-12-16 15:51:26 -06:00
Taylor Otwell bc339f7123 add lock_connection 2020-12-16 15:51:26 -06: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
Taylor Otwell 3b2ed46e65 update variables 2020-12-12 08:47:22 -06:00
Taylor Otwell ddb26fbc50 update env vars 2020-12-10 09:26:28 -06:00
Attila Szeremi 03ecf00f7a
Gitignore docker-compose.override.yml (#5487) 
Docker allows for you to override parts of `docker-compose.yml` locally with the help of a `docker-compose.override.yml` file: https://docs.docker.com/compose/extends/#understanding-multiple-compose-files

I propose to have this file ignored by default for new projects, similarly to how `.env` is ignored to be able to override default configuration (locally).

Example use case: Someone might want to use Laravel Sail, but would have multiple Laravel projects running in MySQL and would like to run a single MySQL server for each project and have a way to be able to override docker-compose to make that happen. Or maybe just in general they want to add a new service that they want to run only for themselves, and not for colleagues.
 2020-12-10 07:32:49 -06:00
Taylor Otwell b7cde8b495 comment trust hosts 2020-12-10 07:14:14 -06:00
Taylor Otwell d80ff4d576 add sponsor 2020-12-09 08:32:27 -06:00
Taylor Otwell 17668beabe add sail 2020-12-08 09:51:48 -06:00
Taylor Otwell 34368a4fab revert change 2020-12-08 09:45:05 -06:00
Taylor Otwell bcd87e80ac add sail file 2020-12-08 09:38:54 -06:00
Taylor Otwell ad8210f3bb Merge branch '8.x' of github.com:laravel/laravel into 8.x 2020-12-08 09:06:00 -06:00
Taylor Otwell a895748980 update env file for sail 2020-12-08 09:04:09 -06: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
Daniel Coulbourne f6f772ba54
Uncomment TrustHosts middleware to enable it by default. (#5477) 2020-11-26 08:38:56 -06:00
Taylor Otwell 82213fbf40 remove cloud option 2020-11-25 10:24:16 -06:00
Taylor Otwell d218676d4c Merge branch '8.x' of github.com:laravel/laravel into 8.x 2020-11-24 16:10:45 -06:00
Taylor Otwell 612d166004 comment out alias by default 2020-11-24 16:10:36 -06:00
Dries Vints d4cf3e2c71
Merge branch '8.x' 
# Conflicts:
#	CHANGELOG.md
 2020-11-24 18:21:08 +01:00