IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,594 Commits 1 Branch 0 Tags
Commit Graph

11594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Claus-Peter Hübner
814bb996db merge of PR-2465: setup unit tests for federation 2022-12-16 01:31:58 +01:00
Ulf Gebhardt
ba2ad05088
Merge branch 'semaphore' into test-semaphore 2022-12-15 23:08:31 +01:00
Ulf Gebhardt
5a925c0526
"fixed" semaphore tests 2022-12-15 23:08:19 +01:00
Ulf Gebhardt
f306dddfaf
console logs, fix order by id instead of date 2022-12-15 23:06:29 +01:00
Moriz Wahl
20fbaa276f feat(backend): test semaphore 2022-12-15 18:35:11 +01:00
Moriz Wahl
e4e698b082
Merge pull request #2467 from gradido/release-v1.16.0 
feat(release): version 1.16.0
 2022-12-15 18:31:22 +01:00
Moriz Wahl
78a780568a feat(release): version 1.16.0 2022-12-15 17:07:35 +01:00
Moriz Wahl
d03a3f601c mock semaphore to allow to use jest fake timers 2022-12-15 17:00:35 +01:00
jjimenezgarcia
a15b985c82
Merge pull request #2426 from gradido/clear-old-password-junk 
refactor(backend): cleaning user related old password junk
 2022-12-15 16:12:44 +01:00
Moriz Wahl
cb55da5d32 confirming two contributions at once does not throw anymore 2022-12-15 15:58:02 +01:00
Moriz Wahl
8bf95ad0ee
Merge pull request #2465 from gradido/setup-unit-tests-for-hyperswarm 
feat(backend): setup unit tests for federation
 2022-12-15 14:46:14 +01:00
Ulf Gebhardt
9537910413
lock also on contributions 2022-12-15 13:07:53 +01:00
Ulf Gebhardt
a98d569fb3
lock also on transactionLink 2022-12-15 13:07:53 +01:00
Ulf Gebhardt
3d52875588
external semaphore transactions lock file 2022-12-15 13:07:53 +01:00
Ulf Gebhardt
c2c7e34539
share the lock for transactions via external file. Do all possible checks before acquiring the lock 2022-12-15 13:07:53 +01:00
Moriz Wahl
1320c962ac Merge branch 'clear-old-password-junk' of github.com:gradido/gradido into clear-old-password-junk 2022-12-15 13:04:48 +01:00
Moriz Wahl
ce0e306284 remove unused import 2022-12-15 13:03:23 +01:00
Moriz Wahl
873076ebfc remove unused import 2022-12-15 13:02:19 +01:00
Moriz Wahl
88eeed7530 Merge branch 'master' into clear-old-password-junk 2022-12-15 12:56:34 +01:00
Ulf Gebhardt
f741986b2b
Merge branch 'master' into semaphore 2022-12-15 12:41:59 +01:00
Ulf Gebhardt
1f765bd3f4
fix find last Transaction 2022-12-15 12:41:42 +01:00
Moriz Wahl
2233bd9b84
Merge pull request #2453 from gradido/consistent-transaction-table 
fix(database): consistent transaction table
 2022-12-15 12:29:18 +01:00
Ulf Gebhardt
ef6d697514
Merge branch 'master' into semaphore 
# Conflicts:
#	backend/src/graphql/resolver/TransactionResolver.ts
 2022-12-15 12:02:07 +01:00
Ulf Gebhardt
97b169da2e
properly typecast and do thing right 2022-12-15 11:49:28 +01:00
Ulf Gebhardt
8afd66088d
Merge branch 'master' into consistent-transaction-table 2022-12-15 11:27:31 +01:00
Ulf Gebhardt
00a7ac4eb5
deleted old comment 2022-12-15 11:18:31 +01:00
Ulf Gebhardt
59b40bf44d
Merge branch 'master' into clear-old-password-junk 
# Conflicts:
#	backend/src/graphql/resolver/TransactionResolver.ts
#	backend/src/graphql/resolver/UserResolver.ts
 2022-12-15 11:17:45 +01:00
Claus-Peter Hübner
5cdffc1734 Merge remote-tracking branch 'origin/master' into 
2420-feature-federation-implement-exchange-of-api-versions-persist-in-table
 2022-12-14 21:38:26 +01:00
Ulf Gebhardt
243fdc16c7
Merge pull request #2416 from gradido/dissolve_admin_resolver 
refactor(backend): dissolve admin resolver
 2022-12-14 17:48:28 +01:00
Moriz Wahl
e7435fd4fe feat(backend): setup unit tests federation 2022-12-14 17:23:20 +01:00
joseji
798051f360 docker error solved 2022-12-14 00:10:55 +01:00
Moriz Wahl
1229a7f7df change database version 2022-12-13 22:14:06 +01:00
Moriz Wahl
0bcd441837 rename migrations and entity number 2022-12-13 21:26:32 +01:00
joseji
9b97b6c40e removed text files regarding passphrase 2022-12-13 21:16:57 +01:00
Moriz Wahl
b52c62749c include user contact in user context object 2022-12-13 21:07:12 +01:00
Moriz Wahl
7b8d4e5c85 update database version 2022-12-13 20:54:07 +01:00
Moriz Wahl
35f9157f41 Merge branch 'master' into clear-old-password-junk 2022-12-13 20:52:06 +01:00
Moriz Wahl
1b31d09278 add tests for semaphore 2022-12-13 20:42:20 +01:00
Moriz Wahl
c59a5a3d30
Merge branch 'master' into semaphore 2022-12-13 20:31:36 +01:00
Moriz Wahl
7470a80818
Merge branch 'master' into consistent-transaction-table 2022-12-13 20:31:13 +01:00
Ulf Gebhardt
330f85e04e
Merge branch 'master' into dissolve_admin_resolver 
# Conflicts:
#	backend/src/graphql/resolver/AdminResolver.ts
 2022-12-13 16:20:30 +01:00
Moriz Wahl
6e766fa76c
Merge pull request #2418 from gradido/test-validation-of-optin-codes 
fix(backend): email verification code never expired
 2022-12-13 16:17:03 +01:00
Moriz Wahl
02656ee117 fix tests after merge 2022-12-13 15:49:41 +01:00
Moriz Wahl
98742c0db1 Merge branch 'master' into test-validation-of-optin-codes 2022-12-13 14:57:15 +01:00
Ulf Gebhardt
f2dadcd93d
Merge branch 'master' into consistent-transaction-table 2022-12-13 10:13:34 +01:00
Ulf Gebhardt
cc8cabef69
Merge branch 'master' into semaphore 
# Conflicts:
#	backend/src/graphql/resolver/TransactionResolver.ts
 2022-12-13 10:05:20 +01:00
Hannes Heine
4be546c68e
Merge branch 'master' into dissolve_admin_resolver 2022-12-13 09:01:44 +01:00
Moriz Wahl
907cd03ab8
Merge pull request #2451 from gradido/consistent-user-contacts-table 
fix(database): consistent deleted at bewteen users and user contacts
 2022-12-12 14:58:51 +01:00
Moriz Wahl
04c88a743b
Merge branch 'master' into consistent-user-contacts-table 2022-12-12 13:50:40 +01:00
Moriz Wahl
82d92d9223 Merge branch 'consistent-user-contacts-table' into consistent-transaction-table 2022-12-12 12:46:46 +01:00