elweyn
|
0b2887b86f
|
Correct joins between contribution and transaction
|
2022-12-01 15:21:49 +01:00 |
|
Moriz Wahl
|
7f1e69c1bd
|
update database version
|
2022-12-01 14:52:08 +01:00 |
|
Moriz Wahl
|
4a27fa07f0
|
fix(database): consistent deleted at bewteen users and user contacts
|
2022-12-01 14:49:56 +01:00 |
|
elweyn
|
ec396e8521
|
Merge master.
|
2022-12-01 12:45:15 +01:00 |
|
elweyn
|
96fd4cb14c
|
Merge branch 'master' into 2285-mark-creation-via-link
|
2022-12-01 12:07:52 +01:00 |
|
elweyn
|
46014adc6d
|
Database join contribution to transaction table, add new join to query.
|
2022-12-01 12:07:25 +01:00 |
|
Claus-Peter Hübner
|
f7a7049e99
|
linting
|
2022-12-01 01:04:29 +01:00 |
|
Claus-Peter Hübner
|
783f81a410
|
remove the test-code for pure update against insert on duplicate key
update
|
2022-12-01 00:32:22 +01:00 |
|
Claus-Peter Hübner
|
52d2c546db
|
Merge remote-tracking branch 'origin/master' into 2420-feature-federation-implement-exchange-of-api-versions-persist-in-table
|
2022-12-01 00:27:31 +01:00 |
|
Claus-Peter Hübner
|
7ab8922e33
|
rework PR comments
|
2022-12-01 00:26:46 +01:00 |
|
Moriz Wahl
|
a91158a963
|
Merge pull request #2443 from gradido/fix-negative-amount-on-send-coins
fix(backend): critical bug
|
2022-11-30 20:40:59 +01:00 |
|
Moriz Wahl
|
272c7ee491
|
Merge branch 'master' into fix-negative-amount-on-send-coins
|
2022-11-30 18:04:26 +01:00 |
|
|
|
37ffbd28b3
|
Merge branch 'master' into dissolve_admin_resolver
|
2022-11-30 17:19:02 +01:00 |
|
|
|
bed31ab3ec
|
Merge pull request #2442 from gradido/fix_docker_production_build
fix(other): missing files for docker production build
|
2022-11-30 17:18:29 +01:00 |
|
Moriz Wahl
|
796f5af2c6
|
remove unused function, count resent by admin
|
2022-11-30 14:45:02 +01:00 |
|
Moriz Wahl
|
bbd163f1e0
|
integrate export const checkEmailVerificationCode = async (
|
2022-11-30 14:34:09 +01:00 |
|
Moriz Wahl
|
10781b2e6b
|
Merge branch 'master' into test-validation-of-optin-codes
|
2022-11-30 14:15:21 +01:00 |
|
Moriz Wahl
|
bc20bfa8f6
|
fix(backend): delete / undelete email contact as well
|
2022-11-30 12:46:46 +01:00 |
|
Moriz Wahl
|
c0096aa26c
|
fix(backend): critical bug
|
2022-11-30 12:15:47 +01:00 |
|
Claus-Peter Hübner
|
6c043a0eb0
|
rework PR comments
|
2022-11-30 01:57:40 +01:00 |
|
Claus-Peter Hübner
|
0bb0d40300
|
Merge branch '2420-feature-federation-implement-exchange-of-api-versions-persist-in-table' of github.com:gradido/gradido into 2420-feature-federation-implement-exchange-of-api-versions-persist-in-table
|
2022-11-30 00:38:10 +01:00 |
|
Claus-Peter Hübner
|
0657753826
|
Merge remote-tracking branch 'origin/master' into 2420-feature-federation-implement-exchange-of-api-versions-persist-in-table
|
2022-11-30 00:36:40 +01:00 |
|
Claus-Peter Hübner
|
8db3c0f9d6
|
rework PR comments
|
2022-11-30 00:35:50 +01:00 |
|
|
|
2db6329a46
|
Merge branch 'master' into fix_docker_production_build
|
2022-11-29 23:45:54 +01:00 |
|
|
|
10ad42babe
|
missing files to be copied
|
2022-11-29 16:37:25 +01:00 |
|
Wolfgang Huß
|
84b5479610
|
Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables
|
2022-11-29 14:21:50 +01:00 |
|
Wolfgang Huß
|
317224db7a
|
Refactor some readme's by moving their content into 'CONTRIBUTING.md'
|
2022-11-29 14:09:15 +01:00 |
|
Wolfgang Huß
|
a7ee30fc3f
|
Fix some comments and readme spellings
|
2022-11-29 13:42:37 +01:00 |
|
Wolfgang Huß
|
3d55c7da9e
|
Fix production by copying missing email templates and locale files into the build folder
|
2022-11-29 13:41:42 +01:00 |
|
Wolfgang Huß
|
88cae0e528
|
Move email '*.pug' templates in 'templates' folder
|
2022-11-29 13:40:08 +01:00 |
|
mahula
|
e00fe51017
|
Merge pull request #2424 from gradido/2342-bug-moderators-can-send-messages-twice-by-clicking-fast
fix(frontend): in contribution messages formular a message can be send twice, when clicking the submit button fast
|
2022-11-29 11:36:41 +01:00 |
|
mahula
|
b662f957b4
|
Merge branch 'master' into 2342-bug-moderators-can-send-messages-twice-by-clicking-fast
|
2022-11-29 11:06:19 +01:00 |
|
mahula
|
403e68480c
|
change variable name to our standard naming
|
2022-11-29 11:05:26 +01:00 |
|
Wolfgang Huß
|
8afe0aaf3b
|
Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables
|
2022-11-29 07:58:17 +01:00 |
|
|
|
7f9190f276
|
lint fix
|
2022-11-29 06:31:57 +01:00 |
|
|
|
fa5b7e6b81
|
Merge branch 'master' into dissolve_admin_resolver
# Conflicts:
# backend/src/graphql/resolver/TransactionResolver.ts
# backend/src/graphql/resolver/UserResolver.test.ts
# backend/src/graphql/resolver/UserResolver.ts
|
2022-11-29 06:15:31 +01:00 |
|
clauspeterhuebner
|
bbb0a7cf98
|
Merge branch 'master' into 2420-feature-federation-implement-exchange-of-api-versions-persist-in-table
|
2022-11-29 01:35:02 +01:00 |
|
clauspeterhuebner
|
4c3847e68f
|
Merge pull request #2201 from gradido/2179-bug-wrong-month-for-contribution-near-turn-of-month
fix(backend): wrong month for contribution near turn of month
|
2022-11-29 01:33:58 +01:00 |
|
clauspeterhuebner
|
1e4d922c88
|
Merge branch 'master' into 2179-bug-wrong-month-for-contribution-near-turn-of-month
|
2022-11-29 01:06:14 +01:00 |
|
Claus-Peter Hübner
|
0ef185e70f
|
changes after merge with master
|
2022-11-29 00:37:52 +01:00 |
|
Claus-Peter Hübner
|
5b4aa35688
|
Merge remote-tracking branch 'origin/master' into
2420-feature-federation-implement-exchange-of-api-versions-persist-in-table
|
2022-11-29 00:28:33 +01:00 |
|
Claus-Peter Hübner
|
10d79e061d
|
exchange CommunityApiList per DHT.socket and store/update it in database
|
2022-11-29 00:19:50 +01:00 |
|
Claus-Peter Hübner
|
7fb88736fb
|
add community entity
|
2022-11-29 00:18:04 +01:00 |
|
Claus-Peter Hübner
|
87af3f6b88
|
shift enum in index.ts
|
2022-11-29 00:17:23 +01:00 |
|
Claus-Peter Hübner
|
3a17a3491b
|
correct publicKey length and table name of entity
|
2022-11-29 00:15:36 +01:00 |
|
clauspeterhuebner
|
f2380c6dfa
|
Merge pull request #2374 from gradido/2367-feature-add-federation-configs
feat(backend): add federation config properties
|
2022-11-28 22:56:35 +01:00 |
|
clauspeterhuebner
|
0d9b759bea
|
Update deployment/bare_metal/.env.dist
set federation diabled as default
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2022-11-28 15:09:00 +01:00 |
|
clauspeterhuebner
|
b297e81787
|
Merge branch 'master' into 2367-feature-add-federation-configs
|
2022-11-28 15:07:31 +01:00 |
|
Wolfgang Huß
|
dc7957a0fb
|
Merge branch 'master' of github.com:gradido/gradido into 2392-refactor-more-emails-to-translatables
# Conflicts:
# backend/src/util/utilities.ts
|
2022-11-28 11:22:25 +01:00 |
|
Wolfgang Huß
|
4ae96a2213
|
Translate 'Gradido (nicht antworten)'
|
2022-11-28 11:13:04 +01:00 |
|
