Skip to content

Commit

Permalink
Merge branch 'release' into 'master'
Browse files Browse the repository at this point in the history
PB-25443: Release v4.1.2 stable

See merge request passbolt/passbolt-ce-api!162
  • Loading branch information
cedricalfonsi committed Jul 26, 2023
2 parents bd0765b + 4cb7045 commit ffc4fc9
Show file tree
Hide file tree
Showing 38 changed files with 5,473 additions and 1,459 deletions.
25 changes: 24 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,20 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [4.1.2] - 2023-07-26
### Fixed
- PB-25472 Fix emails not sent for SMTP server using NTLM authentication

### Maintenance
- PB-25471 Crowdin should export only a selected subset of languages

## [4.1.2-rc.2] - 2023-07-25
### Fixed
- PB-25472 Fix emails not sent for SMTP server using NTLM authentication

### Maintenance
- PB-25471 Crowdin should export only a selected subset of languages

## [4.1.1] - 2023-07-13
### Fixed
- PB-25304 As an administrator the application healthcheck should compare passbolt version with the latest stable release
Expand Down Expand Up @@ -1291,7 +1305,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- AP: User with plugin installed
- AD: Admin

[Unreleased]: https://github.com/passbolt/passbolt_api/compare/v3.10.0...HEAD
[Unreleased]: https://github.com/passbolt/passbolt_api/compare/v4.1.1...HEAD
[4.1.1]: https://github.com/passbolt/passbolt_api/compare/v4.1.0...v4.1.1
[4.1.0]: https://github.com/passbolt/passbolt_api/compare/v4.0.2...v4.1.0
[4.0.2]: https://github.com/passbolt/passbolt_api/compare/v4.0.1...v4.0.2
[4.0.1]: https://github.com/passbolt/passbolt_api/compare/v4.0.0...v4.0.1
[4.0.0]: https://github.com/passbolt/passbolt_api/compare/v3.12.2...v4.0.0
[3.12.2]: https://github.com/passbolt/passbolt_api/compare/v3.12.0...v3.12.2
[3.12.0]: https://github.com/passbolt/passbolt_api/compare/v3.11.1...v3.12.0
[3.11.1]: https://github.com/passbolt/passbolt_api/compare/v3.11.0...v3.11.1
[3.11.0]: https://github.com/passbolt/passbolt_api/compare/v3.10.0...v3.11.0
[3.10.0]: https://github.com/passbolt/passbolt_api/compare/v3.9.0...v3.10.0
[3.9.0]: https://github.com/passbolt/passbolt_api/compare/v3.8.3...v3.9.0
[3.8.3]: https://github.com/passbolt/passbolt_api/compare/v3.8.1...v3.8.3
Expand Down
Empty file added RELEASE_NOTES.md
Empty file.
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"ext-openssl": "*",
"ext-pdo": "*",
"ext-curl": "*",
"cakephp/cakephp": "^4.4.11",
"cakephp/cakephp": "^4.4.15",
"cakephp/migrations": "dev-master#46a3e7bf6f26e71b7c4287497b6d2e47eded1ae2",
"robmorgan/phinx": "0.x-dev#a409b03e1e3e5f8f60d0d3179704abc9bc80e817",
"cakephp/plugin-installer": "^1.3.1",
Expand Down Expand Up @@ -168,8 +168,7 @@
"i18n:externalize": [
"./bin/cake i18n extract --app ./ --paths src,plugins,templates --output resources/locales/en_UK --exclude /tests,/vendors,/src/Command --overwrite --extract-core no --no-location --merge yes",
"find resources/locales/en_UK -name '*.pot' -exec sh -c 'mv \"$1\" \"${1%.pot}.po\"' _ {} \\;"
],
"i18n:update": "git checkout l10n_release -- resources/locales/de_DE resources/locales/en_UK resources/locales/es_ES resources/locales/fr_FR resources/locales/it_IT resources/locales/ja_JP resources/locales/ko_KR resources/locales/lt_LT resources/locales/nl_NL resources/locales/pl_PL resources/locales/pt_BR resources/locales/ro_RO resources/locales/sv_SE"
]
},
"prefer-stable": true
}
14 changes: 7 additions & 7 deletions composer.lock

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

6 changes: 3 additions & 3 deletions config/version.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
return [
'passbolt' => [
'version' => '4.1.1',
'name' => 'Insane in the Brain',
]
'version' => '4.1.2',
'name' => 'Bella ciao',
],
];
14 changes: 14 additions & 0 deletions crowdin.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
files:
- source: /resources/locales/en_UK/*.po
translation: /resources/locales/%locale_with_underscore%/%original_file_name%
export_languages:
- de
- en
- es
- fr
- it
- ja
- ko
- lt
- nl
- pl
- pt-BR
- ro
- sv
commit_message: '[skip-ci]'
14 changes: 7 additions & 7 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"grunt-contrib-watch": "^1.1.0",
"jquery": "^3.5.1",
"openpgp": "5.2.1",
"passbolt-styleguide": "^4.1.1"
"passbolt-styleguide": "^4.1.2"
}
}
Loading

0 comments on commit ffc4fc9

Please sign in to comment.