12310 Commits

Author SHA1 Message Date
ogerly
997b37bf48 change InputAmount v-if 2022-12-15 13:08:28 +01:00
9537910413
lock also on contributions 2022-12-15 13:07:53 +01:00
a98d569fb3
lock also on transactionLink 2022-12-15 13:07:53 +01:00
3d52875588
external semaphore transactions lock file 2022-12-15 13:07:53 +01:00
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
ogerly
f9f717a02a yarn lint, yarn locales 2022-12-15 13:05:36 +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
ogerly
a5ae7f4419 add time in contribution form 2022-12-15 13:04:10 +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
f741986b2b
Merge branch 'master' into semaphore 2022-12-15 12:41:59 +01:00
1f765bd3f4
fix find last Transaction 2022-12-15 12:41:42 +01:00
mahula
439bd3d447 adopt unit tests for transaction form to changes of design 2022-12-15 12:33:27 +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
ef6d697514
Merge branch 'master' into semaphore
# Conflicts:
#	backend/src/graphql/resolver/TransactionResolver.ts
2022-12-15 12:02:07 +01:00
97b169da2e
properly typecast and do thing right 2022-12-15 11:49:28 +01:00
8afd66088d
Merge branch 'master' into consistent-transaction-table 2022-12-15 11:27:31 +01:00
00a7ac4eb5
deleted old comment 2022-12-15 11:18:31 +01:00
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
ogerly
edcd7f6903 outcomment lastTransaction three-dots-vertical 2022-12-15 10:59:15 +01:00
ogerly
2839613bcf contribution change name in nav 2022-12-15 10:56:52 +01:00
ogerly
2d36bc2af2 contribution style nav and items 2022-12-15 10:43:09 +01:00
2de16d9c17
Merge branch 'master' into 2332-mark-contribution-as-rejected 2022-12-15 09:56:50 +01:00
Claus-Peter Hübner
973ad2fe06 DB-Version nach merge mit Master angepasst 2022-12-14 23:47:42 +01:00
Claus-Peter Hübner
326672905a eine Version 0_1 hinzugefügt 2022-12-14 23:46:52 +01:00
Claus-Peter Hübner
1124e2ce96 Merge remote-tracking branch 'origin/master' into
2428-feature-federation-implement-multiple-apollo-graphql-endpoints
2022-12-14 22:52:09 +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
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
ogerly
971cf97ccf date format and margin changed 2022-12-14 16:02:05 +01:00
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