Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

main to release branch #1988

Merged
merged 74 commits into from
Sep 23, 2024
Merged

main to release branch #1988

merged 74 commits into from
Sep 23, 2024

Conversation

MartinJurcoGlina
Copy link
Collaborator

@MartinJurcoGlina MartinJurcoGlina commented Sep 23, 2024 •
edited
Loading

Checklist

  • I have followed (at least) the PR section of the contributing guide.
  • I fixed all necessary PR warnings
  • The commit history is clean
  • The E2E tests are passing
  • If possible, the issue has been divided into more subtasks
  • I did a self review before requesting a review from another team member

Description

How to test

  1. <E.g. login as user XYZ>
  2. <E.g. try to create new subproject>
  3. <E.g. You should not see error in console>
  4. ...

Closes ModifyMe

Peter Baus and others added 30 commits August 12, 2024 15:12
temp
4b47920
Update website user guide
f0d9557
temp
25e385c
@SamuelPull
Upgrade axios lib to patched version (#1941)
4b502f0
@MartinJurcoGlina
updated a few more links and texts
dcbb0c3
@MartinJurcoGlina
Merge branch 'main' of github.com:openkfw/TruBudget into update-websi…
72afa22 
…te-wiki
@MartinJurcoGlina
Merge pull request #1936 from openkfw/update-website-wiki
40b6ded 
Update website user guide
@SamuelPull
api, frontend: added workflow mode option
95d7ff5
Add working file creating.
b0bf1f2
@SamuelPull
Merge branch 'main' into 1829-workflow-ordering
3240a93
@SamuelPull
ui: updated german localization
b9fce1a
@SamuelPull
e2e: add unordered workflow test
816c5bc
@SamuelPull
e2e: removed test of deprecated workflowitem type
6d8400d
@SamuelPull
excel-export: Updated subproject sheet with wf mode
8a556e1
@galethil
862 remote fingerprint (#1933)
cb16dfa
@SamuelPull
e2e: fix documents spec (#1947)
63c28a1
@SamuelPull
e2e: fix some tests still failing on pipeline (#1948)
13b9ead
scrips,api:Working upgradable app
310a737
scrips:Add port for local browsing of minio files
9f45a5e
@SamuelPull
Merge branch 'main' into 1829-workflow-ordering
5684b9e
@SamuelPull
api: fix export data missing wf mode
9ae7c4e
@SamuelPull
api, frontend: autocheck file integrity (#1940)
831c587
@SamuelPull
blockchain: upgrade multichain (#1938)
a2f9934
@MartinJurcoGlina
Merge pull request #1942 from openkfw/1829-workflow-ordering
8cb4afc 
api, frontend: added workflow mode option
@MartinJurcoGlina
1906-show all tags (#1946)
ff397ce
api:Remove unused COPY from Dockerfile
12666d0
@SamuelPull
ui, api, storage: file comment
645958f
Merge branch 'main' into 1863-upgrade-button
7b08ec9
@SamuelPull
wip
1be74ca
@SamuelPull
wip
252ef55
galethil and others added 26 commits September 10, 2024 13:48
@galethil
Fix absolute import to relative (#1969)
5d9b224 
* api:Fix ausolute import to relative

* npm audit fix

* blockchain:npm audit fix

---------

Co-authored-by: Peter Baus <[email protected]>
blockchain:npm audit fix
252b78b
merge main
70c3d69
uprade express
1769ac9
@MartinJurcoGlina
Merge pull request #1971 from openkfw/minor-fix
f848f6f 
Minor fix
@galethil
Add protocol to all connections (#1974)
a3b1a29 
* frontend,api,excel-export,provisioning,storage:Add protocol variable

* frontend,api,excel-export,provisioning,storage:Add protocol variable

* api:Fix typescript type

* e2e:Increate provisioning timeout

* api:Fix typescript type

* api:Add missing vars. Fix typescript type.

---------

Co-authored-by: Peter Baus <[email protected]>
@SamuelPull
Merge branch 'main' into 1900-docs-metadata
9aedbb8
@MartinJurcoGlina
Merge pull request #1949 from openkfw/minio-dev-browser
0dd8d3e 
1950 Add port for local browsing of minio files
@SamuelPull
api: secure cookie env var (#1979)
c7581cc
@SamuelPull
Merge branch 'main' into 1900-docs-metadata
b1938b9
@SamuelPull
api, ui: add comment to external link in wf item
09bf545
@SamuelPull
provisioning: configurable timeout (#1981)
8f2747e
@SamuelPull
Merge branch 'main' into 1900-docs-metadata
003d348
@SamuelPull
more reasonable example
f1f7eb2
@SamuelPull
patch vulnerable library (#1982)
aec1b3e
@SamuelPull
Merge branch 'main' into 1900-docs-metadata
46a4cc4
@SamuelPull
finally
ca61071
@SamuelPull
ui: fix duplicates bug
041f910
@SamuelPull
provisioning: improvement (#1983)
504c596
@MartinJurcoGlina
#1956-renamed all remaining references to old env_example (#1973)
fb85ebf
@galethil @SamuelPull
frontend,scripts:Additional configuration of nginx from env vars (#1978)
226b89d 
Co-authored-by: Peter Baus <[email protected]>
Co-authored-by: Samuel Pull <[email protected]>
@MartinJurcoGlina
Merge pull request #1952 from openkfw/1900-docs-metadata
97ce29d 
#1900 Additional metadata in WF documents
@galethil
frontend:Add nginx buffer config (#1985)
1989bde
@MartinJurcoGlina
bump to v2.15.0
13fbbaf
@MartinJurcoGlina
bump to v2.15.0 fixed changelog
f89d6ce
@MartinJurcoGlina
Merge pull request #1986 from openkfw/bump-to-v2.15.0
2e83742 
bump to v2.15.0
@github-actions GitHub Actions
Copy link

Warnings
⚠️ One of the resource files in the api domain layer (project.ts/subproject.ts/workflowitem.ts) were edited. If a new property was added the excel-export project has to be adapted.

Generated by 🚫 dangerJS against 2e83742

@openkfwCI
Copy link

openkfwCI commented Sep 23, 2024 •
edited
Loading

NotesTime
✅Note for Reviewer: E2E tests on pipeline 60403 on remote server succeededMon, 23 Sep 2024 12:33:14 +0000

Generated by E2E-Test

@MartinJurcoGlina MartinJurcoGlina merged commit 6a8ca2e into 2.x.x-release Sep 23, 2024
89 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SamuelPull SamuelPull SamuelPull approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@MartinJurcoGlina @openkfwCI @SamuelPull @galethil @s2-ctraut