Skip to content

Commit

Permalink
Create 5.2 branch
Browse files Browse the repository at this point in the history
  • Loading branch information
lcharette committed Mar 25, 2024
1 parent ff0d3ea commit 1151294
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 21 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ 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.2.0](https://github.com/userfrosting/userfrosting/compare/5.1.0...5.2.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
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# UserFrosting 5.1
# UserFrosting 5.2

[![Latest Version](https://img.shields.io/github/v/release/userfrosting/userfrosting?include_prereleases&sort=semver)](https://github.com/userfrosting/UserFrosting/releases)
![PHP Version](https://img.shields.io/badge/php-%5E8.1-brightgreen)
[![Build](https://img.shields.io/github/actions/workflow/status/userfrosting/UserFrosting/Build.yml?branch=5.1&logo=github)](https://github.com/userfrosting/UserFrosting/actions)
[![Codecov](https://codecov.io/gh/userfrosting/userfrosting/branch/5.1/graph/badge.svg)](https://codecov.io/gh/userfrosting/userfrosting)
[![Style](https://github.styleci.io/repos/18148206/shield?branch=5.1&style=flat)](https://github.styleci.io/repos/18148206)
[![Build](https://img.shields.io/github/actions/workflow/status/userfrosting/UserFrosting/Build.yml?branch=5.2&logo=github)](https://github.com/userfrosting/UserFrosting/actions)
[![Codecov](https://codecov.io/gh/userfrosting/userfrosting/branch/5.2/graph/badge.svg)](https://codecov.io/gh/userfrosting/userfrosting)
[![Style](https://github.styleci.io/repos/18148206/shield?branch=5.2&style=flat)](https://github.styleci.io/repos/18148206)
[![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE.md)
[![Join the chat](https://img.shields.io/badge/Chat-UserFrosting-brightgreen?logo=Rocket.Chat)](https://chat.userfrosting.com/channel/support)
[![Backers on Open Collective](https://img.shields.io/opencollective/backers/userfrosting?logo=opencollective)](#backers)
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
"require": {
"php": "^8.1",
"ext-gd": "*",
"userfrosting/framework": "~5.1.0",
"userfrosting/sprinkle-core": "~5.1.0",
"userfrosting/sprinkle-account": "~5.1.0",
"userfrosting/sprinkle-admin": "~5.1.0",
"userfrosting/theme-adminlte": "~5.1.0"
"userfrosting/framework": "~5.2.0@dev",
"userfrosting/sprinkle-core": "~5.2.0@dev",
"userfrosting/sprinkle-account": "~5.2.0@dev",
"userfrosting/sprinkle-admin": "~5.2.0@dev",
"userfrosting/theme-adminlte": "~5.2.0@dev"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3.0",
Expand Down
44 changes: 34 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"name": "my-app",
"dependencies": {
"@userfrosting/sprinkle-admin": "~5.1.0",
"@userfrosting/theme-adminlte": "~5.1.0"
"@userfrosting/sprinkle-admin": "github:userfrosting/theme-adminlte#5.2",
"@userfrosting/theme-adminlte": "github:userfrosting/theme-adminlte#5.2"
},
"devDependencies": {
"@symfony/webpack-encore": "^4.4.0",
Expand Down

0 comments on commit 1151294

Please sign in to comment.