Skip to content

Commit 79e3465

Browse files
committed
Merge branch 'main' into 1945-links
2 parents d7da486 + c152e72 commit 79e3465

File tree

147 files changed

+5895
-5037
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

147 files changed

+5895
-5037
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ When creating a new branch, you should consider the following guidelines regardi
9090

9191
### Git Workflow
9292

93-
To get an idea about the workflow used in our project you should read this [how to / git].
9493
So when working on a feature branch make sure to:
9594

9695
1. Checkout the main branch and pull the recent changes
@@ -131,5 +130,4 @@ describe. For example, take a look at [api/src/](api/src/) to get started.
131130
[guidelines]: https://keepachangelog.com/en/1.0.0/
132131
[git commit guidelines]: https://chris.beams.io/posts/git-commit/
133132
[open a pull request]: https://github.com/openkfw/TruBudget/pulls
134-
[how to / git]: https://gist.github.com/robertpataki/1b70e22d14ef92e1be1338314809b46e
135-
[documentation]: https://github.com/openkfw/TruBudget/tree/main/doc
133+
[documentation]: https://github.com/openkfw/TruBudget/tree/main/docs

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
blank_issues_enabled: false # force the usage of a template
22
contact_links:
33
- name: Documentation ❔
4-
url: https://github.com/openkfw/TruBudget/tree/main/doc
4+
url: https://github.com/openkfw/TruBudget/tree/main/docs
55
about: Check out the Trubudget documentation for support.
66
- name: Trubudget Community Support 👪
77
url: https://github.com/openkfw/TruBudget/discussions

.github/workflows/github-ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
needs: danger
3030
strategy:
3131
matrix:
32-
node-version: [ 18.x ]
32+
node-version: [ 20.x ]
3333
project: [ frontend, api, blockchain, provisioning ]
3434
defaults:
3535
run:
@@ -44,7 +44,7 @@ jobs:
4444
needs: [ danger, lint ]
4545
strategy:
4646
matrix:
47-
node-version: [ 18.x ]
47+
node-version: [ 20.x ]
4848
project:
4949
[
5050
frontend,
@@ -77,7 +77,7 @@ jobs:
7777
needs: [ danger, lint, audit ]
7878
strategy:
7979
matrix:
80-
node-version: [ 18.x ]
80+
node-version: [ 20.x ]
8181
project: [ frontend, api ]
8282
defaults:
8383
run:
@@ -95,7 +95,7 @@ jobs:
9595
- run: npm ci
9696

9797
- name: Check for Changes in ${{ matrix.project }}
98-
uses: marceloprado/[email protected].1
98+
uses: ktamas77/[email protected].3
9999
id: run-test
100100
with:
101101
paths: ${{ matrix.project }}

.github/workflows/update-documentation.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010
continue-on-error: true
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
14-
- uses: actions/setup-node@v1
13+
- uses: actions/checkout@v4
14+
- uses: actions/setup-node@v4
1515
with:
16-
node-version: "16.x"
16+
node-version: 18
1717
- uses: webfactory/[email protected]
1818
with:
1919
ssh-private-key: ${{ secrets.OPENKFWCI_SSH_PRIVATE_KEY }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ scripts/development/certs
1616
scripts/operation/.env
1717
.idea/
1818
docs/developer/api-docs
19+
scripts/development/.env.bak
1920
scripts/operation/.env.bak
2021
scripts/operation/cronjob.err
2122
scripts/operation/cronjob.output

CHANGELOG.md

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,45 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
2020
<!-- ### Fixed -->
2121

2222

23+
## [2.17.0] - 2024-11-11
24+
25+
<!-- ## Unreleased -->
26+
27+
### Added
28+
29+
- UI: New design for Login Page [#2040](https://github.com/openkfw/TruBudget/issues/2040)
30+
- notifications: Added a notification when creating a workflow action [#2035](https://github.com/openkfw/TruBudget/issues/2035)
31+
- email-notification-service: Create transport without authentication [#2021](https://github.com/openkfw/TruBudget/issues/2021)
32+
- Add Remove button for each document/external link in DocumentUpload modal [#2018](https://github.com/openkfw/TruBudget/issues/2018)
33+
- Joi validation of environment variables for all services [#2005](https://github.com/openkfw/TruBudget/issues/2005)
34+
- Workflow item level have an option to specify the funding source [#1901](https://github.com/openkfw/TruBudget/issues/1901)
35+
36+
37+
38+
### Changed
39+
40+
- Change wording when changing permissions [#1889](https://github.com/openkfw/TruBudget/issues/1889)
41+
- In the ‘Total Budget’ overview the term ‘Amount’ should be changed to ‘Financing Amount’. [#1875](https://github.com/openkfw/TruBudget/issues/1875)
42+
- Rename the ‘Total Budget’ overview to ‘Participating Stakeholder’. [#1874](https://github.com/openkfw/TruBudget/issues/1874)
43+
44+
45+
<!-- ### Deprecated -->
46+
47+
<!-- ### Removed -->
48+
49+
### Fixed
50+
51+
- Reset password email not working with RS256 [#2082](https://github.com/openkfw/TruBudget/issues/2082)
52+
- blockchain<->email-service not working properly with RS256 [#2080](https://github.com/openkfw/TruBudget/issues/2080)
53+
- blockchain: Email notification protocol bug [#2077](https://github.com/openkfw/TruBudget/issues/2077)
54+
- Fix warning for nested div in console [#2042](https://github.com/openkfw/TruBudget/issues/2042)
55+
- ui: Creating new user often failing with "password cannot be empty" [#2034](https://github.com/openkfw/TruBudget/issues/2034)
56+
- ui: Cannot submit project edit when deleting tags [#2026](https://github.com/openkfw/TruBudget/issues/2026)
57+
- Some workflowitems cannot be closed due to error [#1894](https://github.com/openkfw/TruBudget/issues/1894)
58+
- Fix warning in subproject modal [#2032](https://github.com/openkfw/TruBudget/issues/2032)
59+
- Copy Paste functionality seems to work only on page 1 of projects [#1944](https://github.com/openkfw/TruBudget/issues/1944)
60+
- Documentation: Link to eMail service incorrect [#1943](https://github.com/openkfw/TruBudget/issues/1943)
61+
2362
## [2.16.0] - 2024-10-04
2463

2564
<!-- ## Unreleased -->
@@ -1269,7 +1308,8 @@ If you install TruBudget freshly, this is not an issue for you. If you update to
12691308
- Updated translation keys and language-specific formatting.
12701309
- Fixed bug where the subproject permissions dialog would break the details view of another project.
12711310

1272-
[unreleased]: https://github.com/openkfw/TruBudget/compare/v2.16.0...main
1311+
[unreleased]: https://github.com/openkfw/TruBudget/compare/v2.17.0...main
1312+
[2.17.0]: https://github.com/openkfw/TruBudget/compare/v2.16.0...v2.17.0
12731313
[2.16.0]: https://github.com/openkfw/TruBudget/compare/v2.15.0...v2.16.0
12741314
[2.15.0]: https://github.com/openkfw/TruBudget/compare/v2.14.0...v2.15.0
12751315
[2.14.0]: https://github.com/openkfw/TruBudget/compare/v2.13.0...v2.14.0

api/buildDocs.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ for file in ./*.md ./*/*.md; do
2121
sed -i ${delimiter:+""} 's/# Interface:/#/g' $file
2222
sed -i ${delimiter:+""} 's/# Enumeration:/#/g' $file
2323
sed -i ${delimiter:+""} 's/# Module:/#/g' $file
24-
24+
2525
title=$(sed '1q;d' $file)
26-
26+
2727
if [[ $title == "# Event" ]]; then
2828
pathToDoc=$(echo $(sed '4q;d' $file) | sed 's/.*\[\([^]]*\)\].*/\1/g')
2929
sed -i ${delimiter:+""} 's|# Event|# Event: '$pathToDoc'|g' $file
30-
30+
3131
fi
3232
if [[ $title == "# RequestData" ]]; then
3333
pathToDoc=$(echo $(sed '4q;d' $file) | sed 's/.*\[\([^]]*\)\].*/\1/g')
@@ -54,4 +54,4 @@ echo '{"label": "Interfaces","position": 6}' > ./interfaces/_category_.json
5454

5555

5656
# for local testing copy docs to trubudget-website repo, e.g.
57-
# cp -a ../api-docs ../../../../trubudget-website/docs/developer/
57+
# cp -a ../api-docs ../../../../trubudget-website/docs/developer/

0 commit comments

Comments
 (0)