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
12,979 Commits 1 Branch 0 Tags
Commit Graph

12979 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ogerly
1eea07ac70 rightSide LastTransaction style, click name 2022-12-14 15:42:31 +01:00
ogerly
01e2763829 GDD amount and MemberTotal count self verticale 2022-12-14 15:25:37 +01:00
ogerly
569ca948cc add new input component, time, hour in contributions 2022-12-14 14:21:07 +01:00
elweyn
10abf45e15 Merge dissolve_admin_resolver to local branch. 2022-12-14 11:04:16 +01:00
ogerly
292829503e my avatar variant gradido 2022-12-14 08:06:04 +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
ogerly
e0ff2a459d change cols for input radios 2022-12-13 21:28:36 +01:00
Moriz Wahl
0bcd441837 rename migrations and entity number 2022-12-13 21:26:32 +01:00
ogerly
e223fc0303 remove unused code 2022-12-13 21:25:30 +01:00
ogerly
a2c7703f9d change input radio as checkbox style 2022-12-13 21:22:09 +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
ogerly
27acb7564b change reviews style 2022-12-13 19:20:08 +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
elweyn
ca01e34394 Get adminUser and find contribution with specific id. 2022-12-13 10:17:35 +01:00
Ulf Gebhardt
f2dadcd93d
Merge branch 'master' into consistent-transaction-table 2022-12-13 10:13:34 +01:00
elweyn
30c72bb734 Setup rejecctContribution method. 2022-12-13 10:10:42 +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
Alexander Friedland
dfca1e36c0
Merge branch 'master' into 2290-New-Design 2022-12-13 09:48:04 +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
35c392bbae adopt unit tests to changes in factory 2022-12-12 14:38:56 +01:00
Moriz Wahl
06b5fa4295 refactor(backend): seed contributions as user 2022-12-12 14:05:15 +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
Moriz Wahl
61899579aa
Merge pull request #2454 from gradido/log-client-timezone-offset 
feat(backend): log client timezone offset
 2022-12-12 12:45:47 +01:00
Moriz Wahl
c449e41cfb update only by SQL, thanks @ulfgebhardt 2022-12-12 12:45:17 +01:00
Claus-Peter Hübner
5ada2478c5 Merge remote-tracking branch 'origin/master' into 2428-feature-federation-implement-multiple-apollo-graphql-endpoints 2022-12-09 22:30:53 +01:00
Claus-Peter Hübner
ef5afd830c now working several instances parallel depending on env-Vars 2022-12-09 22:30:04 +01:00
Ulf Gebhardt
a82e1877a8
Merge branch 'master' into log-client-timezone-offset 2022-12-09 14:14:23 +01:00
Ulf Gebhardt
052f31d8ec
lint 2022-12-09 14:10:46 +01:00
Ulf Gebhardt
7638d29052
merge 2022-12-09 14:09:43 +01:00
Ulf Gebhardt
903fe56f60
Merge branch 'master' into dissolve_admin_resolver 
# Conflicts:
#	backend/src/graphql/resolver/AdminResolver.test.ts
#	backend/src/graphql/resolver/AdminResolver.ts
#	backend/src/graphql/resolver/TransactionResolver.ts
#	backend/src/graphql/resolver/UserResolver.ts
 2022-12-09 14:09:33 +01:00
Wolfgang Huß
70a3b1bc7e
Merge pull request #2398 from gradido/2392-refactor-more-emails-to-translatables 
refactor(backend): refactor more emails to translatables
 2022-12-09 13:12:55 +01:00
Ulf Gebhardt
486777cb35
Merge branch 'master' into 2392-refactor-more-emails-to-translatables 2022-12-09 12:59:59 +01:00
mahula
a6df9eceb9 fix linting 2022-12-09 11:52:35 +01:00
Claus-Peter Hübner
d3fa08bc48 first run is working with defaults, buggy per config settings 2022-12-09 01:24:45 +01:00
Moriz Wahl
effa58d767
Merge pull request #2444 from gradido/fix-delete-email-contact 
fix(backend): delete / undelete email contact as well
 2022-12-08 19:47:29 +01:00
Moriz Wahl
61ecfa22fd
Merge branch 'master' into log-client-timezone-offset 2022-12-08 19:13:26 +01:00
Moriz Wahl
c8fa84ac11
Merge branch 'master' into consistent-user-contacts-table 2022-12-08 19:12:49 +01:00
Moriz Wahl
3051d8f070
Merge branch 'master' into fix-delete-email-contact 2022-12-08 19:11:18 +01:00