5784 Commits

Author SHA1 Message Date
Moriz Wahl
7df0ee6066
Merge pull request #1260 from gradido/language_updates_bernd
language_updates_bernd
2022-01-12 10:09:04 +01:00
elweyn
0cb58912e9 Withdrew import of the LanguageSwitch component instead search for the component name. 2022-01-12 10:07:49 +01:00
elweyn
29b8e362e2 Test that the language switch is present if not on register page. 2022-01-12 10:03:19 +01:00
Moriz Wahl
b95eb902e9 move mailer functions into own folder 2022-01-12 09:54:34 +01:00
Moriz Wahl
1c86b704d3 Merge branch 'master' into test-send-email 2022-01-12 09:49:00 +01:00
Moriz Wahl
632c0255bd Merge branch 'master' into language_updates_bernd 2022-01-12 09:47:54 +01:00
elweyn
dccb8cb2ae Don't show the language-switch on the /register page. 2022-01-12 09:47:46 +01:00
Hannes Heine
d594723200
Merge pull request #1271 from gradido/1241-admin-logout-sends-to-wallet-login
Admin Logout redirectes to the wallet login page.
2022-01-12 08:19:39 +01:00
Hannes Heine
b63674b00b
Merge branch 'master' into 1241-admin-logout-sends-to-wallet-login 2022-01-12 07:52:52 +01:00
3a7bfd7d4c
Merge branch 'master' into language_updates_bernd 2022-01-12 06:43:10 +01:00
9ec068165a
Update frontend/src/locales/de.json 2022-01-12 06:42:27 +01:00
6188d7e0ca
Update frontend/src/locales/de.json
Co-authored-by: Moriz Wahl <moriz.wahl@gmx.de>
2022-01-12 06:41:17 +01:00
Moriz Wahl
85f5b000e1
Merge pull request #1276 from gradido/fix-admin-creation-list
fix: Admin Creation List
2022-01-11 13:55:05 +01:00
Moriz Wahl
e4c8225799 Merge branch 'master' into fix-admin-creation-list 2022-01-11 13:01:30 +01:00
Moriz Wahl
ab4f849a5c
Merge pull request #1278 from gradido/fix-doubled-token
fix: Override Existing Token in Response Header
2022-01-11 13:00:44 +01:00
Moriz Wahl
6abd4cce55 Merge branch 'master' into fix-doubled-token 2022-01-11 12:42:50 +01:00
Moriz Wahl
b1b9390a90
Merge pull request #1280 from gradido/pass-language-to-admin-interface
fix: Pass Language to Admin Interface
2022-01-11 12:39:14 +01:00
Moriz Wahl
075cf862ae Merge branch 'master' into pass-language-to-admin-interface 2022-01-11 12:27:23 +01:00
Moriz Wahl
1f5b004e8d
Merge pull request #1277 from gradido/seed-garrick-ollivander
feat: Seed Garrick Ollivander
2022-01-11 12:26:43 +01:00
Moriz Wahl
d157240d3b remove null definitions 2022-01-11 12:17:08 +01:00
Moriz Wahl
4db9ad049b Merge branch 'master' into seed-garrick-ollivander 2022-01-11 10:38:44 +01:00
Moriz Wahl
1f35e712af
Merge pull request #1273 from gradido/fix-update-open-creations
fix: Fix Update of Open Creations
2022-01-11 10:28:36 +01:00
Moriz Wahl
dc8d838e00 coverage admin interface 77% 2022-01-11 10:07:25 +01:00
Moriz Wahl
b244f31a53 catch language when comming back from admin interface 2022-01-11 10:06:40 +01:00
Moriz Wahl
a679b90425 get the user table test up again 2022-01-11 10:03:57 +01:00
Moriz Wahl
370994b353 get the tests running 2022-01-11 09:58:17 +01:00
Moriz Wahl
fbf88d6d5b fix: Pass Language to Admin Interface 2022-01-11 09:56:45 +01:00
Moriz Wahl
121b7530dc fix: Override Existing Token in Response Header 2022-01-11 09:22:51 +01:00
Moriz Wahl
b5a54929fd feat: Seed Garrick Ollivander 2022-01-11 08:47:53 +01:00
Moriz Wahl
d07755f95a get the tests running 2022-01-10 16:40:37 +01:00
Moriz Wahl
3abce024ba filter transactions for type creation due to the first transaction is always a decay 2022-01-10 16:40:30 +01:00
Moriz Wahl
c4cbc50da0 address correct db column for only creations filter 2022-01-10 16:33:52 +01:00
Hannes Heine
ecb0912346
Merge branch 'master' into 1241-admin-logout-sends-to-wallet-login 2022-01-10 13:56:51 +01:00
elweyn
d857ee02a8 Window.location.assign instead of window.location =, so we can test it. 2022-01-10 13:56:25 +01:00
Moriz Wahl
5c3c22780a get the tests running 2022-01-10 13:45:38 +01:00
Moriz Wahl
814f9e18dd fix update of open creations 2022-01-10 13:25:35 +01:00
Moriz Wahl
933275c367 .global.error to .error as global is not defined so far 2022-01-10 13:03:05 +01:00
Moriz Wahl
6a9d240170
Merge pull request #1266 from gradido/fix-change-password
fix: Change Password in User Profile
2022-01-10 12:51:49 +01:00
elweyn
c08cd7e37c Admin Logout redirectes to the wallet login page. 2022-01-10 12:03:38 +01:00
Hannes Heine
a0e515e53c
Merge branch 'master' into fix-change-password 2022-01-10 11:53:00 +01:00
Hannes Heine
8d181355de
Merge branch 'master' into onboarding_process 2022-01-10 11:50:55 +01:00
Hannes Heine
9b1ad38422
Merge pull request #1269 from gradido/1267-gdt-overview-fix
Wallet shows the wrong gdt sum (gdtSum * 100)
2022-01-10 11:49:34 +01:00
Hannes Heine
731f753e87
Merge branch 'master' into 1267-gdt-overview-fix 2022-01-10 11:41:10 +01:00
Hannes Heine
57a5573007
Merge branch 'master' into fix-change-password 2022-01-10 11:09:04 +01:00
Alexander Friedland
7e4f7badb4
Merge pull request #1261 from gradido/1240-Account-not-activated-needs-a-button-to-login-page
1240 account not activated needs a button to login page
2022-01-10 11:07:49 +01:00
elweyn
09a1b05ca0 Backend gave the gdtSum with cents include in the number, now divided by 100. 2022-01-10 11:03:10 +01:00
ogerly
6a25d1177c add href on profil settings change language 2022-01-10 10:59:09 +01:00
Moriz Wahl
fd409252cb get the test working 2022-01-10 10:45:41 +01:00
ogerly
ae2fd66eed add href on profil settings change passwort 2022-01-10 10:43:45 +01:00
ogerly
34e86a7318 add href on profil settings change name 2022-01-10 10:40:05 +01:00