Skip to content

Commit

Permalink
Merge branch '5.0' into 5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
lcharette committed Feb 6, 2024
2 parents 6b0fad1 + 2a337fc commit d587f54
Show file tree
Hide file tree
Showing 6 changed files with 526 additions and 504 deletions.
17 changes: 16 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,27 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [5.1.0](https://github.com/userfrosting/userfrosting/compare/5.0.1...5.1.0)
## [5.1.0](https://github.com/userfrosting/userfrosting/compare/5.0.2...5.1.0)
- Drop PHP 8.1 support, add PHP 8.3 support
- Update to Laravel 10
- Update to PHPUnit 10
- Test against MariaDB [#1238](https://github.com/userfrosting/UserFrosting/issues/1238)

## [5.0.2](https://github.com/userfrosting/UserFrosting/compare/5.0.1...5.0.2)
- Fix Dockerfile - npm missing from the App Image [#1242](https://github.com/userfrosting/UserFrosting/issues/1242)
- Fix AppController says "safe to be deleted", but this breaks 4 routes [#1241](https://github.com/userfrosting/UserFrosting/issues/1241)
- Add PHP 8.3 to test suite

## [5.0.1](https://github.com/userfrosting/UserFrosting/compare/5.0.0...5.0.1)
- [Add env for public URI, default back to empty string](https://github.com/userfrosting/UserFrosting/commit/d89d67b7b76d8043df437ddbebe3d171c86d9b97)
- [Core Sprinkle] [Add env for public URI, default back to empty string](https://github.com/userfrosting/sprinkle-core/commit/1349e309574fb7e4fa910e0b6e81957e257f1a2a)
- [Core Sprinkle] [Remove rel=author, rel=publisher tags from base template](https://github.com/userfrosting/sprinkle-core/commit/b90f7dc3d993a08b383a182d20cec2b381e20a27)
- [Admin Sprinkle] Update success message when admin resets password for a user - Fix [#852](https://github.com/userfrosting/UserFrosting/issues/852)
- [Account Sprinkle] Add deliberate warning when Mail exception occurs during registration - Fix [#1229](https://github.com/userfrosting/UserFrosting/issues/1229)

## [5.0.0](https://github.com/userfrosting/UserFrosting/compare/v4.6.7...5.0.0)
For detailed changelog, see : https://github.com/userfrosting/UserFrosting/releases/tag/5.0.0

## [v4.6.0]

### Changed Requirements
Expand Down
3 changes: 2 additions & 1 deletion app/src/Bakery/HelloCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
/**
* Sample Bakery command.
*
* N.B.: THIS FILE IS SAFE TO EDIT OR DELETE.
* N.B.: This file is sage to edit or delete. If you delete this class, don't
* forget to delete the corresponding entry in the Sprinkle Recipe!
*/
class HelloCommand extends Command
{
Expand Down
3 changes: 2 additions & 1 deletion app/src/Controller/AppController.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
*
* Implements some common site wide routes.
*
* N.B.: THIS FILE IS SAFE TO EDIT OR DELETE.
* N.B.: This file is sage to edit or delete. If you delete this class, don't
* forget to delete the corresponding routes and entry in the Sprinkle Recipe!
*/
class AppController
{
Expand Down
2 changes: 1 addition & 1 deletion app/tests/Controller/AppControllerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
/**
* Tests for AppController Class.
*
* N.B.: THIS FILE IS SAFE TO EDIT OR DELETE.
* N.B.: This file is sage to edit or delete.
*/
class AppControllerTest extends TestCase
{
Expand Down
10 changes: 3 additions & 7 deletions docker/app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@ RUN apt-get update

RUN apt-get install -y apt-utils

# Add NodeJS LTS Repository
ARG NODE_VERSION=18
RUN apt-get install -y ca-certificates curl gnupg \
&& mkdir -p /etc/apt/keyrings \
&& curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
&& echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \
&& apt-get update
# Add NodeJS 18 Repository
RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \
apt-get install -y nodejs

RUN apt-get install -y \
libc-client-dev \
Expand Down
Loading

0 comments on commit d587f54

Please sign in to comment.