5650 Commits

Author SHA1 Message Date
elweyn
c29245b3ca Change the text if the account is not activated yet and changed the button so that we are send to reset password. 2022-01-22 10:00:03 +01:00
Hannes Heine
4541fb5ce9
Merge pull request #1333 from gradido/1302-fix-password-reset-form
Added a required to the password repeat field, errors are shown immed…
2022-01-21 12:42:26 +01:00
elweyn
78cdab5edc Added a required to the password repeat field, errors are shown immediatly on password repeat 2022-01-21 08:24:33 +01:00
ebb7807d7f
Merge pull request #1329 from gradido/fix_rejected_login
fix_rejected_login
2022-01-20 19:50:10 +01:00
fcf7a9fbca
fix broken login with existing token in local store 2022-01-20 17:51:45 +01:00
Alexander Friedland
03f3bc77d8
Merge pull request #1322 from gradido/1320-Transactionlist-for-user-Decay-Balance
defined fields for Transactionlist in UserSearch in Adminarea, add Lo…
2022-01-20 17:15:49 +01:00
6831ba9ade
Merge branch 'master' into 1320-Transactionlist-for-user-Decay-Balance 2022-01-20 16:24:18 +01:00
Moriz Wahl
d3a293ec22
Merge pull request #1321 from gradido/gdd-amount-in-navbar
fix: Render Localized Balance in NavBar
2022-01-20 16:24:00 +01:00
ogerly
fbd0d65b35 add mock in tests 2022-01-20 16:05:16 +01:00
7f8b47afab
Merge branch 'master' into gdd-amount-in-navbar 2022-01-20 16:04:46 +01:00
Alexander Friedland
18efa93faa
Merge branch 'master' into 1320-Transactionlist-for-user-Decay-Balance 2022-01-20 14:33:42 +01:00
Alexander Friedland
ead25d10a4
Merge pull request #1312 from gradido/1227-Vergaenglichkeit-besser-darstellen
1227 vergaenglichkeit besser darstellen
2022-01-20 13:27:43 +01:00
ogerly
a2848fa21c remove in locales formatter for date fields 2022-01-20 13:25:40 +01:00
Alexander Friedland
9f21892d51
Merge branch 'master' into 1320-Transactionlist-for-user-Decay-Balance 2022-01-20 13:23:52 +01:00
ogerly
6f082726f8 change fields key data formatter 2022-01-20 13:22:44 +01:00
Moriz Wahl
c0e092ca40
Merge branch 'master' into gdd-amount-in-navbar 2022-01-20 12:11:45 +01:00
Alexander Friedland
4794c1a9e8
Merge branch 'master' into 1227-Vergaenglichkeit-besser-darstellen 2022-01-20 09:22:04 +01:00
Alexander Friedland
30b32921b6
Merge pull request #1316 from gradido/1300-Gray-out-Register-button-further-when-disabled
1300 gray out register button further when disabled
2022-01-20 09:21:32 +01:00
ogerly
e1df3718c5 add string GDD on creation amount 2022-01-19 17:46:07 +01:00
Alexander Friedland
b4090f50ef
Merge branch 'master' into 1320-Transactionlist-for-user-Decay-Balance 2022-01-19 15:53:18 +01:00
Alexander Friedland
a1de1a2f73
Merge branch 'master' into 1300-Gray-out-Register-button-further-when-disabled 2022-01-19 15:51:51 +01:00
Alexander Friedland
d2bea743c7
Merge pull request #1315 from gradido/1306-Admin-Logo-font-color
change Admin Gradido-Logo font color to white
2022-01-19 15:50:29 +01:00
Alexander Friedland
6ae5305e67
Merge branch 'master' into 1227-Vergaenglichkeit-besser-darstellen 2022-01-19 15:50:05 +01:00
Alexander Friedland
c2557c1f8a
Update frontend/src/views/Pages/SendOverview/GddSend/TransactionConfirmation.vue
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-01-19 15:49:57 +01:00
Alexander Friedland
d0468f8c48
Update frontend/src/locales/de.json
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-01-19 15:49:43 +01:00
Alexander Friedland
590d487837
Update frontend/src/locales/en.json
Co-authored-by: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
2022-01-19 15:49:14 +01:00
Alexander Friedland
d98f94d2f4
Merge branch 'master' into 1320-Transactionlist-for-user-Decay-Balance 2022-01-19 15:18:35 +01:00
Alexander Friedland
534dd7ea96
Merge branch 'master' into 1306-Admin-Logo-font-color 2022-01-19 15:14:52 +01:00
Alexander Friedland
df0051b09a
Merge branch 'master' into 1300-Gray-out-Register-button-further-when-disabled 2022-01-19 15:14:48 +01:00
Alexander Friedland
ed6ffc2cbe
Merge pull request #1317 from gradido/1299-Remove-text-from-Register-PublisherID
1299 remove text from register publisher
2022-01-19 15:14:24 +01:00
elweyn
1aeab3244d yarn lint --fix 2022-01-19 15:10:31 +01:00
elweyn
5d4b3825c1 yarn locales fixed 2022-01-19 15:09:04 +01:00
elweyn
a8de79c0c6 yarn test fixed 2022-01-19 15:08:29 +01:00
ogerly
b86431fa40 change field amount an position 2 last date 2022-01-19 14:42:44 +01:00
elweyn
018bfa05d6 defined fields for Transactionlist in UserSearch in Adminarea, add Localized fields and formatted fields 2022-01-19 14:37:49 +01:00
Moriz Wahl
3b11337fe6 fix: Render Localized Balance in NavBar 2022-01-19 13:37:03 +01:00
ogerly
793e10683e refactor tests for submit button beforeEach 2022-01-19 13:15:04 +01:00
ogerly
0256ab937b yarn lint fix 2022-01-19 13:07:59 +01:00
ogerly
48b3f26a17 more test for submit button function 2022-01-19 13:07:28 +01:00
Alexander Friedland
9bbaf4751e
Merge branch 'master' into 1306-Admin-Logo-font-color 2022-01-19 12:34:50 +01:00
Alexander Friedland
b9ef41869c
Merge branch 'master' into 1299-Remove-text-from-Register-PublisherID 2022-01-19 12:34:43 +01:00
Alexander Friedland
e558ec2209
Merge pull request #1318 from gradido/1249-GDD-GDT-values-look-displaced-or-cut-off
1249 gdd gdt values look displaced or cut off
2022-01-19 12:34:30 +01:00
ogerly
473ea3b92d if form completely filled .attributes('disabled')).toBe(undefined) 2022-01-19 12:29:09 +01:00
ogerly
7e351e6799 yarn lint fix 2022-01-19 12:05:01 +01:00
ogerly
a5489ebb15 test submit buttion have attributes disabled 2022-01-19 12:05:01 +01:00
ogerly
3af4935fbc yarn lint fix 2022-01-19 12:05:01 +01:00
ogerly
26bbc88d87 add computed variable disabled 2022-01-19 12:05:01 +01:00
Alexander Friedland
fcc0aca0b2
Merge branch 'master' into 1306-Admin-Logo-font-color 2022-01-19 10:52:42 +01:00
Alexander Friedland
912e6ef449
Merge branch 'master' into 1299-Remove-text-from-Register-PublisherID 2022-01-19 10:52:37 +01:00
Alexander Friedland
d6bae4ca1e
Merge branch 'master' into 1249-GDD-GDT-values-look-displaced-or-cut-off 2022-01-19 10:52:32 +01:00