12033 Commits

Author SHA1 Message Date
joseji
0176131c39 errors are now logged, and events are checked 2022-09-22 12:07:12 +02:00
elweyn
4fdc492a6c Change query logout to mutation, call of mutation instead of query. 2022-09-22 11:54:36 +02:00
elweyn
2d4f88ce84 Refactor logout method from query to mutation. 2022-09-22 11:53:54 +02:00
joseji
db21cf2e8d removed unused imports 2022-09-22 11:49:56 +02:00
elweyn
f63bfa871a Change login call from query to mutation. 2022-09-22 11:47:48 +02:00
elweyn
e844bcc925 Change login from Query to Mutation. 2022-09-22 11:47:28 +02:00
joseji
c08aac58a9 events and half log tests 2022-09-22 11:44:30 +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
ogerly
1043ec1061 fix lint and locales 2022-09-22 10:41:04 +02:00
ogerly
1c2df858f7 help text 2022-09-22 10:40:25 +02:00
ogerly
c62f1af0bb add pagination for CreationTransactionList.vue 2022-09-22 10:23:49 +02:00
Alexander Friedland
672312a0dc
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-22 10:11:08 +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
ogerly
8e63c573d7 fix locales and lint 2022-09-22 10:08:13 +02:00
ogerly
e566ae8394 resolve conflicts 2022-09-22 10:07:27 +02:00
ogerly
1bcfe14d70 resolve conflicts 2022-09-22 10:06:19 +02:00
Alexander Friedland
592d2c300e
Merge branch 'master' into 2109-Typo-im-Dialog 2022-09-22 10:04:56 +02:00
Alexander Friedland
738a607f93
Update admin/src/components/ContributionLink.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-22 10:04:44 +02:00
Alexander Friedland
487bcee1a7
Update admin/src/components/ContributionLink.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-22 10:04:16 +02:00
Moriz Wahl
b34fd7e76f
Merge branch 'master' into e2e-test-setup 2022-09-22 10:01:35 +02:00
Alexander Friedland
c89cb3b0d0
Update admin/src/locales/en.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-22 09:55:53 +02:00
Alexander Friedland
d9e0a7d480
Update admin/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-09-22 09:55:45 +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
mahula
9469ce9897 adapt lenguage dependent selectors on page object files 2022-09-21 18:25:06 +02:00
mahula
aecf84f5ca fix linting 2022-09-21 18:06:07 +02:00
mahula
2da97bf275 adapt language dependent selectors for login page object 2022-09-21 16:43:31 +02:00
mahula
ab17e77b24 add linting module depencendies to package.json 2022-09-21 16:41:38 +02:00
mahula
75b9273ae1 add token time decoding to custom login command 2022-09-21 16:38:36 +02:00
elweyn
00ae91177e Change the result of the query in test file. 2022-09-21 13:55:37 +02:00
elweyn
a3a565ff01 Removed unused locale key. 2022-09-21 13:46:56 +02:00
elweyn
00d0068efc Remove unused imports. 2022-09-21 13:44:42 +02:00
elweyn
8989b6f50e Change query of the creationTransactionList, add new parameters to CreationTransactionList and add translations. 2022-09-21 13:33:32 +02:00
elweyn
5aa499a073 Change the result for the FE so that we get datas from the contribution table instead of the transaction table. 2022-09-21 13:31:19 +02:00
elweyn
a93085b822 Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction 2022-09-21 12:42:38 +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
elweyn
3a36e09e8f Merge branch '2202-refactor-creations-query' of https://github.com/gradido/gradido into 2202-refactor-creations-query 2022-09-21 11:47:31 +02:00
elweyn
e097c30003 Add denied_at is null to query, change variable name of query. 2022-09-21 11:47:24 +02:00
Claus-Peter Hübner
542b069aa9 reconfig now with rollover feature and userid in logevent-message 2022-09-21 04:12:48 +02:00
clauspeterhuebner
2eabc5a97b
Merge branch 'master' into 2179-bug-wrong-month-for-contribution-near-turn-of-month 2022-09-20 21:16:38 +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