clauspeterhuebner
|
a6d30328ff
|
Merge pull request #2216 from gradido/2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account
config testmodus flag for sending emails to test or team account instead of user account
|
2022-09-23 19:38:50 +02:00 |
|
clauspeterhuebner
|
55a8174822
|
Merge branch 'master' into 2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account
|
2022-09-23 19:29:34 +02:00 |
|
clauspeterhuebner
|
22845c6264
|
Merge pull request #2058 from gradido/1798-feature-gradidoid-1-adapt-and-migrate-database-schema
GradidoID 1: adapt and migrate database schema
|
2022-09-23 19:07:53 +02:00 |
|
clauspeterhuebner
|
e955b92235
|
Merge branch 'master' into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema
|
2022-09-23 18:48:11 +02:00 |
|
Claus-Peter Hübner
|
792d8a8d53
|
eol convert
|
2022-09-23 18:47:07 +02:00 |
|
Claus-Peter Hübner
|
ab1a4ac8d1
|
solve tests
|
2022-09-23 18:24:13 +02:00 |
|
Moriz Wahl
|
79ab041137
|
Merge pull request #2206 from gradido/add-client-request-time
feat: Add Client Request Time to Context
|
2022-09-23 18:18:03 +02:00 |
|
Moriz Wahl
|
929593e92d
|
Merge branch 'master' into add-client-request-time
|
2022-09-23 18:08:46 +02:00 |
|
Claus-Peter Hübner
|
b3bf7fecc4
|
Merge remote-tracking branch 'origin/master' into
1798-feature-gradidoid-1-adapt-and-migrate-database-schema
|
2022-09-23 01:32:44 +02:00 |
|
Claus-Peter Hübner
|
969d6d0fbe
|
Merge branch '1798-feature-gradidoid-1-adapt-and-migrate-database-schema' of github.com:gradido/gradido into 1798-feature-gradidoid-1-adapt-and-migrate-database-schema
|
2022-09-23 01:12:24 +02:00 |
|
Claus-Peter Hübner
|
e701f99553
|
rework PR comments
|
2022-09-23 01:11:37 +02:00 |
|
clauspeterhuebner
|
b0781bce88
|
Update backend/src/graphql/resolver/UserResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-09-23 01:03:07 +02:00 |
|
clauspeterhuebner
|
62446bd2f0
|
Update backend/src/graphql/resolver/AdminResolver.test.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-09-23 00:56:36 +02:00 |
|
Claus-Peter Hübner
|
0b410fd5fd
|
oel convert
|
2022-09-23 00:50:07 +02:00 |
|
clauspeterhuebner
|
810d258965
|
Merge branch 'master' into 2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account
|
2022-09-22 23:31:08 +02:00 |
|
Claus-Peter Hübner
|
de234cc7df
|
rework PR remarks
|
2022-09-22 23:29:51 +02:00 |
|
clauspeterhuebner
|
4735687c0b
|
Merge pull request #2234 from gradido/2219-feature-rework-eventprotocol
2219 feature rework eventprotocol
|
2022-09-22 22:06:47 +02:00 |
|
Moriz Wahl
|
18008e9598
|
Merge branch 'master' into add-client-request-time
|
2022-09-22 21:13:27 +02:00 |
|
clauspeterhuebner
|
63afbab8ea
|
Merge branch 'master' into 2219-feature-rework-eventprotocol
|
2022-09-22 14:56:26 +02:00 |
|
jjimenezgarcia
|
47a7778481
|
Merge pull request #2214 from gradido/test-register-with-redeem-code
Refactor: Test register with redeem code
|
2022-09-22 14:20:51 +02:00 |
|
Moriz Wahl
|
25dd12b18b
|
Merge branch 'master' into add-client-request-time
|
2022-09-22 14:18:14 +02:00 |
|
jjimenezgarcia
|
1d9f76b483
|
Merge branch 'master' into test-register-with-redeem-code
|
2022-09-22 14:04:14 +02:00 |
|
joseji
|
db21cf2e8d
|
removed unused imports
|
2022-09-22 11:49:56 +02:00 |
|
joseji
|
f710fd9b45
|
fixed await for events redeem register
|
2022-09-22 11:19:32 +02:00 |
|
Alexander Friedland
|
c4b4661a5c
|
Merge pull request #2211 from gradido/2203-Delete-query-when-redeeming-the-Redeem-link
2203 delete query modal when redeeming the redeem link
|
2022-09-22 11:13:49 +02:00 |
|
joseji
|
a8fc8b9249
|
solved conflicts
|
2022-09-22 11:01:10 +02:00 |
|
Alexander Friedland
|
ef49dee81d
|
Merge branch 'master' into 2203-Delete-query-when-redeeming-the-Redeem-link
|
2022-09-22 10:10:59 +02:00 |
|
Hannes Heine
|
0102aab498
|
Merge pull request #2228 from gradido/2226-change-email-templates
Refactor: 🍰 Change email templates
|
2022-09-22 09:52:27 +02:00 |
|
Moriz Wahl
|
91acb5f4b8
|
test client request time in request header
|
2022-09-22 08:57:06 +02:00 |
|
Moriz Wahl
|
5c784abe8a
|
test client request time in request header
|
2022-09-22 08:53:58 +02:00 |
|
joseji
|
c822580c1a
|
removed unused variable
|
2022-09-21 19:53:57 +02:00 |
|
joseji
|
6202ca64ad
|
test for register through transaction link done
|
2022-09-21 19:50:27 +02:00 |
|
elweyn
|
6c0cb17196
|
Refactor sendTransactionLinkredeemed
.
|
2022-09-21 12:41:25 +02:00 |
|
elweyn
|
686c43fa89
|
Change text of linkRedeemed template.
|
2022-09-21 12:12:23 +02:00 |
|
elweyn
|
3b3a963ac5
|
Change text template of contributionConfirmed.
|
2022-09-21 12:09:36 +02:00 |
|
elweyn
|
6c446fb477
|
Change text template of transactionReceived.
|
2022-09-21 12:07:19 +02:00 |
|
elweyn
|
bf6ed35c6e
|
Change text template of ContributionMessageReceived.
|
2022-09-21 12:05:49 +02:00 |
|
Claus-Peter Hübner
|
fa76bd68a1
|
Merge remote-tracking branch 'origin/master' into 2215-feature-config-testmodus-flag-for-sending-emails-to-test-or-team-account-instead-of-user-account
|
2022-09-20 19:23:30 +02:00 |
|
Claus-Peter Hübner
|
d29d9bd2ba
|
add property changes in .env files as mentioned in PR
|
2022-09-20 19:11:57 +02:00 |
|
Claus-Peter Hübner
|
736d8023bb
|
add description to create cronjobs for deleting yarn /tmp output
|
2022-09-20 19:10:54 +02:00 |
|
Claus-Peter Hübner
|
95b4052ed5
|
correct and more detailed logoutput
|
2022-09-20 18:26:56 +02:00 |
|
Claus-Peter Hübner
|
7f818fa77e
|
add new const server.ENV_NAME, which will be init by GRADIDO_ENV_NAME in
start.sh or by NODE_ENV in .env
|
2022-09-20 18:26:02 +02:00 |
|
Claus-Peter Hübner
|
34071fd9b4
|
use the new env variable GRADIDO_ENV_NAME to init NODE_ENV
|
2022-09-20 18:21:24 +02:00 |
|
Claus-Peter Hübner
|
ae01f99c36
|
describe the manual setting of new env variable GRADIDO_ENV_NAME
|
2022-09-20 18:20:42 +02:00 |
|
clauspeterhuebner
|
fc706bc030
|
Update backend/src/server/createServer.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-09-20 16:08:56 +02:00 |
|
clauspeterhuebner
|
49e0606d16
|
Update backend/src/server/createServer.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-09-20 16:08:44 +02:00 |
|
clauspeterhuebner
|
ae3ef7edda
|
Update backend/src/mailer/sendEMail.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-09-20 16:08:28 +02:00 |
|
clauspeterhuebner
|
efb6ad70f6
|
Update backend/src/config/index.ts
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-09-20 16:08:05 +02:00 |
|
Moriz Wahl
|
220da200a8
|
Merge branch 'master' into add-client-request-time
|
2022-09-20 10:57:24 +02:00 |
|
Claus-Peter Hübner
|
70963203a0
|
rework Event definitions
|
2022-09-20 00:39:45 +02:00 |
|