7472 Commits

Author SHA1 Message Date
Moriz Wahl
e8920f4c35 all locale handling is done by store, so that commit the language to store on change is enough. Note that dispatch login calls commit language 2022-01-24 17:39:42 +01:00
Alexander Friedland
4e17ad2bda
Merge pull request #1337 from gradido/bold-menu-item-on-current-page
bold text if acive page
2022-01-24 17:39:34 +01:00
b115dd7cab
Merge branch 'master' into deployment_community_parameters 2022-01-24 17:28:45 +01:00
Moriz Wahl
6d6cdb1e64 set i18n.locale and localeChanged from vee-validate inside the language mutation of the store 2022-01-24 17:26:47 +01:00
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
Moriz Wahl
6dca1536c8 test that i18n.locale is set to the value in the store 2022-01-24 17:01:26 +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
919e89576a
Merge branch 'master' into deployment_community_parameters 2022-01-24 16:10:50 +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
elweyn
f061b55933 Merge branch '1319-email-optin' of https://github.com/gradido/gradido into 1319-email-optin 2022-01-22 14:14:30 +01:00
elweyn
2211c7cb28 Change of url in the UI needs to be transfered to the test. 2022-01-22 14:14:20 +01:00
elweyn
f5383e3c05 In case where the user has used an OptIn code that was to old then the user is send to a thx/resetFailed page where he gets a message that the code was to old. 2022-01-22 14:11:54 +01:00
Hannes Heine
97374af7e5
Merge branch 'master' into 1319-email-optin 2022-01-22 13:04:33 +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
elweyn
3676a57398 Fix test so that the UI changes are represented in the tests. 2022-01-22 13:03:24 +01:00
elweyn
93aa8c4865 Fix code style. 2022-01-22 11:14:47 +01:00
47b7618834
Merge branch 'master' into deployment_community_parameters 2022-01-22 11:05:33 +01:00
ogerly
e17d1b34e2 test fixed for checkMail 2022-01-22 10:09:04 +01:00
elweyn
2a4f66a03d If optin code to old send user to the error page that says that the code is not active anymore. 2022-01-22 10:05:15 +01:00
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
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
Moriz Wahl
26fbadb864 fix: Language set Correctly after Page Reload in Admin Interface 2022-01-21 12:16:33 +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
f7037c063b
include stage1 example for deployment bare metal .env.dist 2022-01-21 02:58:32 +01:00
54cc6c9327
adjusted backend .env.template to recognize community variables 2022-01-21 02:58:05 +01:00
Claus-Peter Hübner
6b56a663ab finanzkalkulatorische Regeln 2022-01-21 01:34:54 +01:00
ebb7807d7f
Merge pull request #1329 from gradido/fix_rejected_login
fix_rejected_login
2022-01-20 19:50:10 +01:00
Moriz Wahl
5562e0be60 set jest TZ and fix test 2022-01-20 19:13:20 +01:00
fcf7a9fbca
fix broken login with existing token in local store 2022-01-20 17:51:45 +01:00
Moriz Wahl
dcb4c31779 sort locales 2022-01-20 17:20:44 +01:00
Moriz Wahl
c0138b3811 fix: Set Locale after Login 2022-01-20 17:17:22 +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