Skip to content

Commit

Permalink
Merge 2.x into 3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
SonataCI committed Jul 9, 2023
2 parents b8bb77c + 99bc96c commit 03cf89a
Show file tree
Hide file tree
Showing 9 changed files with 193 additions and 222 deletions.
1 change: 0 additions & 1 deletion .github/workflows/auto-merge-dev-kit.yaml
Expand Up @@ -7,7 +7,6 @@ name: Auto merge DevKit PRs
on:
pull_request_target:
branches:
- 1.x
- 2.x
- 3.x
types: [labeled]
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/documentation.yaml
Expand Up @@ -9,7 +9,6 @@ on:
- cron: '30 0 * * *'
push:
branches:
- 1.x
- 2.x
- 3.x
pull_request:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/frontend.yaml
Expand Up @@ -9,7 +9,6 @@ on:
- cron: '30 0 * * *'
push:
branches:
- 1.x
- 2.x
- 3.x
pull_request:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/lint.yaml
Expand Up @@ -9,7 +9,6 @@ on:
- cron: '30 0 * * *'
push:
branches:
- 1.x
- 2.x
- 3.x
pull_request:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/qa.yaml
Expand Up @@ -9,7 +9,6 @@ on:
- cron: '30 0 * * *'
push:
branches:
- 1.x
- 2.x
- 3.x
pull_request:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test.yaml
Expand Up @@ -9,7 +9,6 @@ on:
- cron: '30 0 * * *'
push:
branches:
- 1.x
- 2.x
- 3.x
pull_request:
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Expand Up @@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [2.0.0](https://github.com/sonata-project/form-extensions/compare/2.0.0-alpha-1...2.0.0) - 2023-07-08
### Added
- [[#444](https://github.com/sonata-project/form-extensions/pull/444)] Add datepicker twig template to the global ones ([@Hanmac](https://github.com/Hanmac))

## [2.0.0-alpha-1](https://github.com/sonata-project/form-extensions/compare/1.x...2.0.0-alpha-1) - 2023-05-13
### Changed
- [[#427](https://github.com/sonata-project/form-extensions/pull/427)] Upgrade DatePicker to v6 (name changed from `eonasdan/bootstrap-datetimepicker` to `eonasdan/tempus-dominus`) ([@jordisala1991](https://github.com/jordisala1991))
Expand All @@ -15,6 +19,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).

See UPGRADE-2.0.md for all changes

## [1.20.0](https://github.com/sonata-project/form-extensions/compare/1.19.1...1.20.0) - 2023-07-08
### Added
- [[#444](https://github.com/sonata-project/form-extensions/pull/444)] Add datepicker twig template to the global ones ([@Hanmac](https://github.com/Hanmac))

## [1.19.1](https://github.com/sonata-project/form-extensions/compare/1.19.0...1.19.1) - 2023-04-30
### Fixed
- [[#416](https://github.com/sonata-project/form-extensions/pull/416)] Date pickers now select the correct locale when language and country parts are the same, eg: `it-IT` ([@jgtrescazes](https://github.com/jgtrescazes))
Expand Down

0 comments on commit 03cf89a

Please sign in to comment.