7801 Commits

Author SHA1 Message Date
Alexander Friedland
9ce0229345
Merge pull request #1687 from gradido/1684-when-generating-a-link-form-does-not-reset
1684 when generating a link form does not reset
2022-03-30 10:11:02 +02:00
ogerly
40c7f96b20 remove onReset in created, add EMPTY_TRANSACTION_DATA in send function 2022-03-30 08:07:32 +02:00
ogerly
d013bd9de1 set function onReset on created components for clear form 2022-03-30 08:00:30 +02:00
902d45e8d2
Merge pull request #1679 from gradido/mass_creation_do_not_show_unactivated
Refactor: Multicreation - do not show unactivated emails
2022-03-29 20:39:30 +02:00
10ae00dba8
Merge branch 'master' into mass_creation_do_not_show_unactivated 2022-03-29 20:31:05 +02:00
Moriz Wahl
eeb5af9249
Merge pull request #1663 from gradido/show-valid-time-of-link-in-email
feat: Show Link Duration in Emails
2022-03-29 20:30:55 +02:00
Moriz Wahl
1db61b3efd
Merge branch 'master' into show-valid-time-of-link-in-email 2022-03-29 20:22:20 +02:00
Moriz Wahl
5608937d75
Merge pull request #1665 from gradido/refactor-balance-resolver
refactor: Balance Resolver
2022-03-29 20:22:08 +02:00
Moriz Wahl
07ad22b71d change function name to print time duration 2022-03-29 20:10:00 +02:00
Moriz Wahl
a38a7889a3
Merge branch 'master' into refactor-balance-resolver 2022-03-29 19:59:12 +02:00
Moriz Wahl
abd58ab9cf new config version 2022-03-29 19:58:12 +02:00
Moriz Wahl
8d1eff0765 new config version 2022-03-29 19:57:52 +02:00
Moriz Wahl
a4b30b385f
Merge branch 'master' into show-valid-time-of-link-in-email 2022-03-29 19:49:24 +02:00
Moriz Wahl
4139a931a3
Merge pull request #1662 from gradido/optin-valid-time
refactor: Set Email Optin Valid Time to 24 hours
2022-03-29 19:49:09 +02:00
Moriz Wahl
b3002027cd new backend version in env dist 2022-03-29 19:38:12 +02:00
Moriz Wahl
43242c98b4
Merge branch 'master' into refactor-balance-resolver 2022-03-29 16:15:33 +02:00
Moriz Wahl
90e6798a7d rename context.count to context.transactionCount 2022-03-29 16:10:06 +02:00
Moriz Wahl
0c5719140d Merge branch 'master' into optin-valid-time 2022-03-29 16:05:56 +02:00
1cdb526669
fixed test to properly check the filters on Admin UserSearch 2022-03-29 12:50:13 +02:00
d95e4d864a
Merge branch 'master' into mass_creation_do_not_show_unactivated 2022-03-29 12:43:13 +02:00
a5d485ee41
Merge pull request #1683 from gradido/fixes_stage1
Fix: Fixes found on Stage1
2022-03-29 12:27:02 +02:00
e5cdb3d7b1
Merge branch 'master' into fixes_stage1 2022-03-29 11:43:21 +02:00
Alexander Friedland
9264a6eb2b
Merge pull request #1656 from gradido/1555-Admin-see-user-generated-link
1555 admin see user generated link
2022-03-29 09:00:36 +02:00
Moriz Wahl
667b964d37 coverage backend to 55% 2022-03-29 02:59:25 +02:00
Moriz Wahl
8fd93ff853 remove test for remove optin from DB after email verification 2022-03-29 02:58:36 +02:00
Moriz Wahl
633eef7c16 round GDD values in balance object 2022-03-29 02:34:13 +02:00
Moriz Wahl
feb89cf4e0 import transaction as db transaction 2022-03-29 01:58:20 +02:00
Moriz Wahl
51258b838e set rights correctly 2022-03-29 01:55:59 +02:00
Moriz Wahl
27ad1d2e22 transaction list model contains balance, user balance resolver to create transacton list result 2022-03-29 01:54:13 +02:00
30e2556384
Merge branch 'master' into fixes_stage1 2022-03-29 01:36:47 +02:00
Moriz Wahl
dc30315311 change resolved object to new schema 2022-03-29 01:31:23 +02:00
Moriz Wahl
03da5aa343 change transaction list query to new balance object 2022-03-29 01:29:08 +02:00
Moriz Wahl
e9e97549a7 rename right to GDT_BALANCE, rename query to gdtBalance, ensure gdtBalance is null when API call fails 2022-03-29 01:12:07 +02:00
Moriz Wahl
d584651fc1 rename right to GDT_BALANCE 2022-03-29 01:11:25 +02:00
Moriz Wahl
a26aaae71a Merge branch 'master' into refactor-balance-resolver 2022-03-29 01:03:52 +02:00
Moriz Wahl
9eda41b24a Merge branch 'optin-valid-time' into show-valid-time-of-link-in-email 2022-03-29 00:59:47 +02:00
Moriz Wahl
37e36e01af do not remove optin code in DB after email verification 2022-03-29 00:51:44 +02:00
Moriz Wahl
cb90249301 rename function, add parameter for optinType, sort by updatedAt DESC 2022-03-29 00:50:50 +02:00
Moriz Wahl
3128ede829
Merge branch 'master' into optin-valid-time 2022-03-29 00:34:04 +02:00
Alexander Friedland
d5b57dcf1c
Merge branch 'master' into 1555-Admin-see-user-generated-link 2022-03-28 18:00:25 +02:00
Moriz Wahl
4637caac10 Test TransactionLinkList 2022-03-28 15:17:25 +02:00
Alexander Friedland
50806d9505
Merge pull request #1680 from gradido/1594-Show-transaction-was-created-by-link
1594 show transaction was created by link
2022-03-28 14:01:57 +02:00
6fa62c1958
Merge branch 'master' into fixes_stage1 2022-03-28 13:52:52 +02:00
Alexander Friedland
453d23a7c9
Merge branch 'master' into 1594-Show-transaction-was-created-by-link 2022-03-28 13:52:38 +02:00
Alexander Friedland
193e085439
sorting properties 2022-03-28 13:51:24 +02:00
Moriz Wahl
f20b8e8f75
Merge pull request #1675 from gradido/increase-max-memo-length
refactor: Memo Text Length to 255 Characters
2022-03-28 13:50:22 +02:00
Alexander Friedland
640923dd50
sorting properties 2022-03-28 13:47:45 +02:00
Alexander Friedland
666f176b35
remove comma from via link 2022-03-28 13:46:34 +02:00
Alexander Friedland
3f7d9e73b3
remove comma from via link 2022-03-28 13:45:11 +02:00
ecc3adbdd0
fix git command git fetch --all in startscript. It doesnt take remote repository as parameter 2022-03-28 10:26:55 +02:00