Alexander Friedland
|
f2e459af29
|
Merge branch 'master' into bold-menu-item-on-current-page
|
2022-01-24 17:24:59 +01:00 |
|
Alexander Friedland
|
ce84cc727a
|
Merge pull request #1335 from gradido/1303-Thanks-page-after-setPassword
1303 thanks page after set password
|
2022-01-24 17:24:18 +01:00 |
|
ogerly
|
1be4d83a36
|
change css for twi elements, sidebar and navbar active only
|
2022-01-24 16:58:03 +01:00 |
|
Moriz Wahl
|
9df3ca7c01
|
mock path to have differnet include results
|
2022-01-24 16:42:09 +01:00 |
|
ogerly
|
d0fdd57b7d
|
bold text if acive page
|
2022-01-24 16:25:40 +01:00 |
|
Alexander Friedland
|
65d2354817
|
Update frontend/src/views/Pages/ResetPassword.spec.js
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
|
2022-01-24 15:58:36 +01:00 |
|
ogerly
|
0bffe9d63e
|
change text for test checkMail
|
2022-01-24 12:43:04 +01:00 |
|
Alexander Friedland
|
6535e4fa83
|
Merge branch 'master' into 1303-Thanks-page-after-setPassword
|
2022-01-24 12:38:56 +01:00 |
|
Hannes Heine
|
b7b018f811
|
Merge pull request #1332 from gradido/1325-creation-confirm-text-falsy
Changed the toasted message for successful creating a creation.
|
2022-01-22 13:04:16 +01:00 |
|
ogerly
|
e17d1b34e2
|
test fixed for checkMail
|
2022-01-22 10:09:04 +01:00 |
|
Hannes Heine
|
a72d1ed3c7
|
Update admin/src/locales/en.json
|
2022-01-22 09:02:45 +01:00 |
|
Hannes Heine
|
5f5ae03042
|
Update admin/src/locales/de.json
|
2022-01-22 09:02:13 +01:00 |
|
Hannes Heine
|
9b4510101f
|
Update admin/src/locales/de.json
|
2022-01-22 09:01:58 +01:00 |
|
Hannes Heine
|
3132708204
|
Update admin/src/locales/en.json
|
2022-01-22 09:01:35 +01:00 |
|
Alexander Friedland
|
14e51b9f87
|
Update frontend/src/views/Pages/ResetPassword.vue
Co-authored-by: Hannes Heine <heine.hannes@gmail.com>
|
2022-01-21 19:01:12 +01:00 |
|
elweyn
|
6ea44890dd
|
Locales where not ordered. yarn locales --fix changes.
|
2022-01-21 15:25:32 +01:00 |
|
Alexander Friedland
|
9e4dc2add7
|
Merge branch 'master' into 1303-Thanks-page-after-setPassword
|
2022-01-21 14:12:57 +01:00 |
|
elweyn
|
67df695227
|
Localized the CreationConfirm toasted messages.
|
2022-01-21 13:19:36 +01:00 |
|
ogerly
|
40021fb46f
|
check on the checkMail page which url path is attached
|
2022-01-21 13:15:34 +01:00 |
|
Hannes Heine
|
0f5d7c549c
|
Merge branch 'master' into 1325-creation-confirm-text-falsy
|
2022-01-21 13:05:45 +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 |
|
ogerly
|
2f0f6d7db7
|
check array and send the correct parameters to the thx page
|
2022-01-21 11:36:50 +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 |
|
elweyn
|
397f1f9d67
|
Change the test to match the new toasted message.
|
2022-01-21 07:41:11 +01:00 |
|
elweyn
|
078c117f6e
|
Changed the toasted message for successful creating a creation.
|
2022-01-21 07:35: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 |
|
