8483 Commits

Author SHA1 Message Date
ogerly
c0878bf1a4 add setAuthItem 2022-03-29 17:05:41 +02:00
ogerly
14942363f5 add style imputs and selects 2022-03-29 17:04:41 +02:00
ogerly
cdc98c63a7 add height 100% 2022-03-29 17:03:59 +02:00
ogerly
0b215954ba add slots AuthItem, add templates auth components 2022-03-29 17:02:57 +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
ogerly
160ee30b7d add import ResetPassword ForgotPassword 2022-03-29 12:37:22 +02:00
ogerly
8564ecb818 add component auth ResetPassword 2022-03-29 12:36:54 +02:00
ogerly
8595633825 add component auth ForgotPassword 2022-03-29 12:36:17 +02:00
a5d485ee41
Merge pull request #1683 from gradido/fixes_stage1
Fix: Fixes found on Stage1
2022-03-29 12:27:02 +02:00
Alexander Friedland
6c953af2f3
Merge branch 'master' into 503-Transaction-List-Pagination-Pages-clickable 2022-03-29 11:48:47 +02:00
Alexander Friedland
b2af0f2429
Update frontend/src/components/GdtTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:48:38 +02:00
Alexander Friedland
a6396cc998
Update frontend/src/components/GdtTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:48:27 +02:00
Alexander Friedland
1ad41ddac8
Update frontend/src/components/GddTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:47:07 +02:00
Alexander Friedland
f6d12c2b46
Update frontend/src/components/GddTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:46:52 +02:00
Alexander Friedland
f4813468de
Update frontend/src/components/GddTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:46:41 +02:00
Alexander Friedland
da9b5f0bbb
Update frontend/src/components/GdtTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:46:28 +02:00
Alexander Friedland
ea825bc6cd
Update frontend/src/components/GdtTransactionList.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:46:07 +02:00
Alexander Friedland
6e8ef54858
Update frontend/src/components/GdtTransactionList.vue
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-03-29 11:45:50 +02:00
e5cdb3d7b1
Merge branch 'master' into fixes_stage1 2022-03-29 11:43:21 +02:00
ogerly
cc74dd87f2 remove unused dropdown items 2022-03-29 11:42:32 +02:00
ogerly
c70aaa3455 change button variant to gradido and outline-gradido 2022-03-29 11:41:25 +02:00
ogerly
3d1f4f96e7 change welcome text, unused bg image 2022-03-29 11:40:24 +02:00
ogerly
655700e9f9 change size from Blaetter.png 2022-03-29 11:13:24 +02:00
ogerly
cdc9f938b8 add button variant gradido, outline-gradido 2022-03-29 11:09:45 +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