15002 Commits

Author SHA1 Message Date
Moriz Wahl
c66440e038 Merge branch 'master' into 3030-feature-role-administration-backend 2023-07-10 14:54:29 +02:00
einhornimmond
139807c437
Merge pull request #3134 from gradido/iota4_fix_missing_volume
fix(other): add missing volume for dlt-connector dev docker
2023-07-09 21:41:59 +02:00
einhornimmond
bfdb326345
Merge branch 'master' into iota4_fix_missing_volume 2023-07-09 16:19:22 +02:00
Hannes Heine
5fc6b07f2e
Merge pull request #3133 from gradido/fix-semaphore-parallel-test
fix(backend): semaphore parallel redeemTransactionLink test
2023-07-09 14:35:58 +02:00
einhornimmond
d9688702c6
Merge branch 'master' into iota4_fix_missing_volume 2023-07-09 14:07:35 +02:00
Einhornimmond
2371ec4eef add missing volume in composer 2023-07-09 10:08:51 +02:00
elweyn
b07cd9d284 Set both parallel mutation in a promise.all block. 2023-07-09 10:01:39 +02:00
Claus-Peter Huebner
3f7852e5d8 linting 2023-07-07 19:41:09 +02:00
Claus-Peter Huebner
301fa1b702 eeeeeendlich hat ers geschluckt... grrrrrrrr 2023-07-07 19:03:28 +02:00
Claus-Peter Huebner
abd59b8ad7 increase coverage to 90 2023-07-07 18:10:22 +02:00
Claus-Peter Huebner
1ae685412f changes after master-merge 2023-07-07 18:06:14 +02:00
Claus-Peter Huebner
c64ef97a06 Merge remote-tracking branch 'origin/master' into
3030-feature-role-administration-backend
2023-07-07 18:05:44 +02:00
Claus-Peter Huebner
e292dcfc8d Merge branch '3030-feature-role-administration-backend' of github.com:gradido/gradido into 3030-feature-role-administration-backend 2023-07-07 17:57:22 +02:00
Claus-Peter Huebner
bbcb97abfb additional tests for userRoles and userContact 2023-07-07 17:55:52 +02:00
einhornimmond
61063424bf
Merge pull request #3118 from gradido/iota4_extra_module_hello_world
feat(other): iota-tangle-connector mit Hello World Message als separates Modul
2023-07-07 12:16:51 +02:00
Einhornimmond
824334b7e6 changed function names 2023-07-07 11:40:27 +02:00
Einhornimmond
df12b8f2bd reduce coverage even more 2023-07-06 19:13:23 +02:00
Einhornimmond
c731bd122e corrected CONFIG export and import, mock @iota/client in Test, send and receive Hello World Message to and from Iota in main 2023-07-06 18:40:33 +02:00
Einhornimmond
90c2810307 reduce coverage because I haven't enough testable code to reach it 2023-07-06 16:06:09 +02:00
Einhornimmond
6ee8dda4ce remove singleton, revert back to using single const 2023-07-06 16:04:22 +02:00
Einhornimmond
89ceb1d27b Merge branch 'iota4_extra_module_hello_world' of github.com:gradido/gradido into iota4_extra_module_hello_world 2023-07-06 15:52:30 +02:00
Einhornimmond
6e6e721df6 move line according to Claus Peters suggestion 2023-07-06 15:52:17 +02:00
einhornimmond
e78eb486d0
Merge branch 'master' into iota4_extra_module_hello_world 2023-07-06 15:08:57 +02:00
4fa5147212
Merge pull request #3026 from gradido/federation-fix-database-public-key-length
refactor(database): fix database public key lengths
2023-07-06 14:04:21 +02:00
4e7c2d73ed
Merge branch 'master' into federation-fix-database-public-key-length 2023-07-06 13:46:12 +02:00
b33478f563
Merge pull request #3044 from gradido/eslint-dht-import
refactor(dht): eslint dht import
2023-07-06 13:45:52 +02:00
35cb0397b0
Merge branch 'master' into eslint-dht-import 2023-07-06 13:23:15 +02:00
2ad31f3e08
Merge pull request #3131 from gradido/v1.22.3
chore(release): v1.22.3
2023-07-06 11:41:39 +02:00
11057c48f0
v.1.22.3 2023-07-06 11:28:06 +02:00
9993fbeaef
Merge pull request #3129 from gradido/fix-email-link
fix(backend): corrected email-link
2023-07-06 11:24:52 +02:00
6a440e18b5
fix email link to have correct url text 2023-07-06 11:07:57 +02:00
5657798016
fix snapshot 2023-07-06 11:03:34 +02:00
caf1b8e9d8
fix email-link 2023-07-06 10:51:59 +02:00
Hannes Heine
0e8c2c225f
Merge pull request #3127 from gradido/release1.22.2
chore(release): v1.22.2
2023-07-06 09:35:45 +02:00
elweyn
6571d9aaf2 chore(release): v1.22.2 2023-07-06 09:18:17 +02:00
Hannes Heine
da94074457
Merge pull request #3123 from gradido/fix-moderation-message-answer-question
fix(backend): moderation message are completely hidden from the user
2023-07-06 08:55:04 +02:00
Einhornimmond
f403fc4192 remove double test with only a single change 2023-07-06 08:28:27 +02:00
Claus-Peter Huebner
0fca31799b searchAdminUsers with relations userRoles 2023-07-06 03:21:51 +02:00
Claus-Peter Huebner
b3234acffc reduce complexitiy of role-setting 2023-07-06 03:19:42 +02:00
Claus-Peter Huebner
e20916fdad reduce complexity of role-setting 2023-07-06 03:19:16 +02:00
Claus-Peter Huebner
6c0a0b8bc2 verifyLogin und searchUsers return isAdmin and isModerator;
searchAdminUser returns role
2023-07-06 03:15:53 +02:00
Claus-Peter Huebner
b19b68a8ea login returns isAdmin and isModerator 2023-07-06 03:14:18 +02:00
Claus-Peter Huebner
329d8b5507 add Field role 2023-07-06 03:13:10 +02:00
89c2c1c778
english typo 2023-07-06 02:08:17 +02:00
960252e9fc
fix comment, typo 2023-07-06 02:07:02 +02:00
Einhornimmond
213f1e1d3e Merge branch 'iota4_extra_module_hello_world' of github.com:gradido/gradido into iota4_extra_module_hello_world 2023-07-05 13:24:41 +02:00
Einhornimmond
d5757bf7ec remove lib 2023-07-05 13:24:15 +02:00
einhornimmond
cc260756dc
Merge branch 'master' into iota4_extra_module_hello_world 2023-07-05 13:12:59 +02:00
Einhornimmond
f35cc43ac4 add claus peters tips 2023-07-05 13:12:32 +02:00
elweyn
e228d8b3e7 Correct the test message. 2023-07-05 12:56:29 +02:00