Skip to content

Commit

Permalink
Merge branch 'b-7.1.x' into b-7.2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Sieg committed Aug 23, 2024
2 parents deb3f80 + 84161d8 commit 98ac58d
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/commit-hooks/pre-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
docker compose exec --workdir /var/www/vendor/oxid-esales/module-template php composer static
docker compose exec -T --workdir /var/www/vendor/oxid-esales/module-template php composer static
21 changes: 16 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [undecided] - unreleased
## [v3.1.0] - unreleased

### Added
- Admin controller
- Template for admin controller
- Example of extending of current admin template
- ``oxNew`` object factory example
- Admin controller example in Greeting namespace
- Template for special greeting admin controller
- Example with extending of current admin template
- ``oxNew`` model object factory example in Greeting namespace infrastructure

### Fixed
- "the input device is not a TTY" error message during github hook if problems found

## [v3.1.0] - Unreleased

Expand Down Expand Up @@ -42,6 +45,14 @@ This is the stable release for v3.0.0. No changes have been made since v3.0.0-rc
- Smarty support
- Migration are not triggered anymore on module activation. Ensure you run them separately after module **Installation**.

## [v2.2.0] - unreleased

### Added
- Admin controller
- Template for admin controller
- Example of extending of current admin template
- ``oxNew`` object factory example

## [v2.1.0] - 2024-05-30

### Added
Expand Down

0 comments on commit 98ac58d

Please sign in to comment.