Claus-Peter Hübner
|
3dd66b4527
|
small changes in log-pattern
Merge remote-tracking branch 'origin/master' into
2220-feature-reconfigure-log4js
|
2022-09-23 00:31:33 +02:00 |
|
Claus-Peter Hübner
|
99f0905bee
|
Merge remote-tracking branch 'origin/master' into 2220-feature-reconfigure-log4js
|
2022-09-22 23:42:23 +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 |
|
Alexander Friedland
|
00faee4bd4
|
Merge branch 'master' into 2109-Typo-im-Dialog
|
2022-09-22 22:43:44 +02:00 |
|
Alexander Friedland
|
c7abc78ad8
|
Merge branch 'master' into send-form-border-radius
|
2022-09-22 22:43:36 +02:00 |
|
Alexander Friedland
|
6011564cf2
|
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction
|
2022-09-22 22:43:18 +02:00 |
|
clauspeterhuebner
|
43b5f79ddb
|
Merge branch 'master' into 2220-feature-reconfigure-log4js
|
2022-09-22 22:07:50 +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 |
|
joseji
|
79f7ebce57
|
updated event working, deletion is not working properly (deeper than the event itself)
|
2022-09-22 17:35:41 +02:00 |
|
ogerly
|
8b2a781be1
|
style: deleted max-rows 6 from all forms textareas
|
2022-09-22 15:14:58 +02:00 |
|
ogerly
|
52524120ba
|
style: deleted max-rows 6 from all forms textareas
|
2022-09-22 15:11:55 +02:00 |
|
clauspeterhuebner
|
63afbab8ea
|
Merge branch 'master' into 2219-feature-rework-eventprotocol
|
2022-09-22 14:56:26 +02:00 |
|
ogerly
|
3f821d24bb
|
style: add border-radius on send form
|
2022-09-22 14:47:34 +02:00 |
|
Hannes Heine
|
69b0ee7cbb
|
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction
|
2022-09-22 14:35:49 +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 |
|
ogerly
|
347591783e
|
fix test
|
2022-09-22 13:44:25 +02:00 |
|
ogerly
|
c961c47c0f
|
change methods to emit
|
2022-09-22 13:15:09 +02:00 |
|
Alexander Friedland
|
09023d2332
|
Merge branch 'master' into 2198-adminarea-more-dates-on-created-transaction
|
2022-09-22 13:09:20 +02:00 |
|
Alexander Friedland
|
5732182844
|
Merge branch 'master' into 2109-Typo-im-Dialog
|
2022-09-22 13:05:52 +02:00 |
|
ogerly
|
976620e603
|
the name of the month written out
|
2022-09-22 12:48:08 +02:00 |
|
elweyn
|
61f59a2594
|
Remove query of contribution message resolver test since it is never used.
|
2022-09-22 12:34:03 +02:00 |
|
elweyn
|
98aca9ff52
|
Change the tests setup to the call of mutations instead of queries.
|
2022-09-22 12:29:03 +02:00 |
|
elweyn
|
4461ff92a5
|
Correct tests after changing login and logout from queries to mutations.
|
2022-09-22 12:22:56 +02:00 |
|
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 |
|