16462 Commits

Author SHA1 Message Date
einhornimmond
181a5948cf
Merge branch 'master' into frontend_admin_static 2024-02-13 18:09:27 +01:00
einhornimmond
c7d6049bd9 fix test 2024-02-13 17:28:23 +01:00
einhornimmond
08bfff3521
Merge branch 'master' into dlt_transmit_to_iota 2024-02-13 12:17:18 +01:00
einhornimmond
a60aa7eb4e typo 2024-02-13 12:16:41 +01:00
einhornimmond
2c28d4c9fb merged 2024-02-13 12:14:36 +01:00
clauspeterhuebner
8a45d1c043
Merge pull request #3281 from gradido/3263-feature-gms-publish-user-backend-update-user-settings
feat(backend): 3263 feature gms publish user backend update user settings
2024-02-12 20:54:00 +01:00
Claus-Peter Huebner
f0d5741964 linting 2024-02-12 20:44:36 +01:00
Claus-Peter Huebner
d6d8093850 remove unnecessary parameter settings 2024-02-12 20:42:24 +01:00
Claus-Peter Huebner
0c1f6cde70 no mandatory parameters in updateUserInfos 2024-02-12 20:07:46 +01:00
einhornimmond
3dcafa6606
Merge branch 'master' into dlt_transmit_to_iota 2024-02-12 18:10:18 +01:00
clauspeterhuebner
4ba4a239f2
Merge branch 'master' into 3263-feature-gms-publish-user-backend-update-user-settings 2024-02-12 16:45:36 +01:00
clauspeterhuebner
c114394725
Merge pull request #3265 from gradido/3264-feature-gms-publish-user-backend-gradido-communities-dialog
feat(backend): gms publish user backend gradido communities dialog
2024-02-12 16:45:09 +01:00
Claus-Peter Huebner
62b38bfc75 rework review comment 2024-02-09 23:41:46 +01:00
Claus-Peter Huebner
f70ff4d74b solve merge conflicts 2024-02-09 23:32:42 +01:00
Claus-Peter Huebner
ae0887eb42 Merge remote-tracking branch
'origin/3264-feature-gms-publish-user-backend-gradido-communities-dialog'
into 3263-feature-gms-publish-user-backend-update-user-settings
2024-02-09 23:26:20 +01:00
Claus-Peter Huebner
cf9ef95b5b rework review comments 2024-02-09 22:35:53 +01:00
clauspeterhuebner
50baed9149
Merge branch 'master' into 3264-feature-gms-publish-user-backend-gradido-communities-dialog 2024-02-09 22:00:20 +01:00
clauspeterhuebner
9f110db08c
Merge pull request #3256 from gradido/3237-feature-connect-gms-api-with-a-new-rest-client
feat(backend): 3237 feature connect gms api with a new rest client
2024-02-09 21:59:42 +01:00
clauspeterhuebner
ae42ac6788
Merge branch 'master' into 3237-feature-connect-gms-api-with-a-new-rest-client 2024-02-09 21:50:15 +01:00
clauspeterhuebner
fed0e7e09c
Update deployment/bare_metal/.env.dist
Sorry, these lines were part of merge conflicts and not clear for me what to do...

Co-authored-by: einhornimmond <dario.rekowski@gmx.de>
2024-02-09 21:49:36 +01:00
einhornimmond
12e9a916b3
Merge pull request #3283 from gradido/release-2_2_0
chore(release): v2.2.0
2024-02-09 20:24:42 +01:00
einhornimmond
5727fabafb
Merge branch 'master' into release-2_2_0 2024-02-09 20:10:30 +01:00
einhornimmond
a3d785140e
Merge pull request #3282 from gradido/prerelease-2_2_0
fix(backend): prevent warning, fix env error
2024-02-09 20:10:14 +01:00
einhornimmond
54c8ef3431 require branch name also in hetzner_cloud/install.sh 2024-02-09 15:36:57 +01:00
einhornimmond
7ba2cb0d95 release, improve release script 2024-02-08 17:47:19 +01:00
einhornimmond
442dcd1046 prevent warning, fix env error 2024-02-08 15:51:07 +01:00
Claus-Peter Huebner
59dfe5cfc3 Merge remote-tracking branch 'origin/3237-feature-connect-gms-api-with-a-new-rest-client' into 3264-feature-gms-publish-user-backend-gradido-communities-dialog 2024-02-08 01:21:01 +01:00
Claus-Peter Huebner
a3c18408af Merge remote-tracking branch 'origin/master' into
3237-feature-connect-gms-api-with-a-new-rest-client
2024-02-08 00:57:45 +01:00
Claus-Peter Huebner
491f4d2131 adaptions after merge master 2024-02-08 00:15:57 +01:00
Claus-Peter Huebner
29a62dadd5 adaptions after merge master 2024-02-07 23:55:30 +01:00
Claus-Peter Huebner
64d192f752 Merge remote-tracking branch 'origin/master' into
3263-feature-gms-publish-user-backend-update-user-settings
2024-02-07 23:54:59 +01:00
Claus-Peter Huebner
d0370614e8 linting 2024-02-07 23:42:14 +01:00
Claus-Peter Huebner
3f2387cfa1 linting 2024-02-07 23:35:27 +01:00
Claus-Peter Huebner
cff2517156 linting 2024-02-07 23:13:02 +01:00
Claus-Peter Huebner
028337b291 solve tests for updateUserInfo with gmsLocation 2024-02-07 21:03:46 +01:00
einhornimmond
819d24a491
Merge branch 'master' into frontend_admin_static 2024-02-06 13:56:07 +01:00
einhornimmond
6454adb78e
Merge branch 'master' into dlt_transmit_to_iota 2024-02-06 13:55:53 +01:00
einhornimmond
57c02f9266
Merge pull request #3279 from gradido/update_info
feat(frontend): update news text
2024-02-06 13:40:28 +01:00
einhornimmond
f7c6a53d76 fix lint 2024-02-06 12:20:59 +01:00
einhornimmond
879f0a2bc2 fix english button caption 2024-02-06 12:15:57 +01:00
einhornimmond
60d35df1bc update news text 2024-02-05 20:48:32 +01:00
einhornimmond
c142b0f2c6
Merge branch 'master' into frontend_admin_static 2024-02-05 20:25:38 +01:00
einhornimmond
1c9691a612
Merge pull request #3277 from gradido/frontend_send_routing
feat(frontend): use params instead of query for send/identifier route
2024-02-05 20:24:11 +01:00
einhornimmond
7a6f1655bc fix bug with admin 2024-02-05 18:41:48 +01:00
einhornimmond
00d84d5c24 fix nginx config 2024-02-05 14:19:44 +01:00
einhornimmond
6500aac585 precompress admin and frontend files, server directly via nginx 2024-02-05 13:48:17 +01:00
einhornimmond
07d2e6c846 rename paringTransaction to pairingTransaction 2024-02-03 18:54:42 +01:00
einhornimmond
b2f77ddfbf fix linting 2024-02-03 16:43:19 +01:00
einhornimmond
95b4810631 change logic, transaction.community is now community on which blockchain it is, not longer signerCommunity, transaction.otherCommunity is now the same like TransactionBody.otherGroup 2024-02-03 16:30:07 +01:00
einhornimmond
148f89d471 fix problem with reset send formular 2024-02-03 14:15:33 +01:00