|
|
7638d29052
|
merge
|
2022-12-09 14:09:43 +01:00 |
|
|
|
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 |
|
|
|
486777cb35
|
Merge branch 'master' into 2392-refactor-more-emails-to-translatables
|
2022-12-09 12:59:59 +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
|
3051d8f070
|
Merge branch 'master' into fix-delete-email-contact
|
2022-12-08 19:11:18 +01:00 |
|
Moriz Wahl
|
cbb688112f
|
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2022-12-08 19:11:09 +01:00 |
|
Moriz Wahl
|
bd3f05d6c8
|
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
|
2022-12-08 19:11:01 +01:00 |
|
Hannes Heine
|
4794ca61c1
|
Merge pull request #2363 from gradido/2285-mark-creation-via-link
feat(backend): 🍰 Mark creation via link
|
2022-12-06 12:34:41 +01:00 |
|
elweyn
|
d52f7f9590
|
change transactionLinkId to linkId.
|
2022-12-06 12:20:21 +01:00 |
|
elweyn
|
ffb5988760
|
Refactoring of some small smelling code.
|
2022-12-06 11:58:17 +01:00 |
|
|
|
9f6038b748
|
Merge branch 'master' into fix-delete-email-contact
|
2022-12-05 12:00:55 +01:00 |
|
|
|
80d3a7bb18
|
Merge branch 'master' into 2392-refactor-more-emails-to-translatables
|
2022-12-02 11:59:03 +01:00 |
|
elweyn
|
3ba591637c
|
Remove unused method.
|
2022-12-02 07:32:08 +01:00 |
|
|
|
ac578b3f10
|
Merge branch 'master' into dissolve_admin_resolver
|
2022-12-01 21:45:19 +01:00 |
|
Moriz Wahl
|
2caa0ad4c9
|
Merge branch 'master' into 2285-mark-creation-via-link
|
2022-12-01 18:46:24 +01:00 |
|
Moriz Wahl
|
e458a7dd8d
|
Merge pull request #2452 from gradido/fix-jest-run-all-timeers
fix(backend): run all timers for high values
|
2022-12-01 16:21:37 +01:00 |
|
Moriz Wahl
|
41495c2c65
|
fix(backend): run all timers for high values
|
2022-12-01 15:53:09 +01:00 |
|
elweyn
|
0b2887b86f
|
Correct joins between contribution and transaction
|
2022-12-01 15:21:49 +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 |
|
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
|
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 |
|
|
|
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
|
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 |
|
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 |
|
Wolfgang Huß
|
3b47330c92
|
Remove remainders of old untranslated emails
|
2022-11-28 11:05:12 +01:00 |
|
Wolfgang Huß
|
93e3562318
|
Remove old untranslated email 'sendTransactionReceivedEmail'
|
2022-11-28 11:04:34 +01:00 |
|
