3143 Commits

Author SHA1 Message Date
ogerly
b5faaabd49 seperate text for slide picture 2022-06-21 11:59:36 +02:00
Wolfgang Huß
101bab6e9f
Merge branch 'master' into 1880-no-throw-when-register-with-existing-email 2022-06-21 10:43:50 +02:00
Wolfgang Huß
b88e01c818 Merge branch '1880-no-throw-when-register-with-existing-email' of github.com:gradido/gradido into 1880-no-throw-when-register-with-existing-email 2022-06-20 16:12:24 +02:00
Wolfgang Huß
50f5667288 Merge branch 'master' of github.com:gradido/gradido into 1880-no-throw-when-register-with-existing-email
# Conflicts:
#	backend/src/graphql/resolver/UserResolver.ts
2022-06-20 13:56:25 +02:00
Alexander Friedland
84bd3130c8
Merge branch 'master' into 1976-Customise-the-mobile-view 2022-06-20 12:14:59 +02:00
Moriz Wahl
8ce97391e1
Update frontend/src/pages/TransactionLink.spec.js 2022-06-17 14:11:52 +02:00
Moriz Wahl
4475da0fbe fix tests 2022-06-17 13:58:46 +02:00
ogerly
1d66b9511c remove alert 2022-06-16 23:55:57 +02:00
ogerly
6210ff8597 fix test for LanguageSwitch2 2022-06-16 23:31:07 +02:00
ogerly
b1b74f5c1b fix test 2022-06-16 16:45:23 +02:00
ogerly
33ed4db29a set redeem valid amount 2022-06-16 16:07:23 +02:00
ogerly
0d0d6bec9a fix locales 2022-06-16 16:03:53 +02:00
ogerly
3ed8d71aef check contribution link valid 2022-06-16 16:03:01 +02:00
Moriz Wahl
845e3d3e61 get QueryLinkResult working 2022-06-16 15:11:13 +02:00
ogerly
a64f91cb13 fix lint 2022-06-16 14:35:08 +02:00
ogerly
ef881d94cd load contribution link and transaction link 2022-06-16 14:34:30 +02:00
ogerly
1ba7e86173 changed redeem for contribution link and transaction link 2022-06-16 10:21:59 +02:00
Wolfgang Huß
2bdf98bc15
Update frontend/src/locales/de.json
Co-authored-by: Alexander Friedland <ogerly@users.noreply.github.com>
2022-06-15 07:38:09 +02:00
Wolfgang Huß
a3af34bd18 Merge branch 'master' of github.com:gradido/gradido into 1880-no-throw-when-register-with-existing-email 2022-06-14 07:40:44 +02:00
ogerly
aa44c4cffe refactor mobile style step 1 2022-06-13 11:08:19 +02:00
Alexander Friedland
62fafb9eae
Merge branch 'master' into 1973-List-open-contribution-links-in-the-wallet 2022-06-13 08:39:14 +02:00
ogerly
fa966bf62f add list dummy data, fixed lint, locales, stylelint 2022-06-09 07:55:12 +02:00
ogerly
55d44fa022 add text to locales 2022-06-09 07:23:09 +02:00
ogerly
ab76a35095 refactor tests 2022-06-08 22:35:58 +02:00
ogerly
b0baa8e021 change Statistik Container 2022-06-08 22:25:47 +02:00
ogerly
83ebf4aa2e add Statistik Container 2022-06-08 22:25:14 +02:00
ogerly
eb7f8290af add Page Community, add query listContributionLinks 2022-06-08 22:15:59 +02:00
ogerly
1e0e6e24b9 locales link german, english navbar 2022-06-02 21:46:18 +02:00
Wolfgang Huß
37149b40fa Remove method 'commitStorePublisherId' from Register.Vue 2022-06-02 16:15:11 +02:00
Wolfgang Huß
ffd11cb755 Remove error 'User already exists.' from Register.Vue 2022-06-02 16:12:52 +02:00
ogerly
de7a41516a refactor register button position 2022-06-02 08:04:21 +02:00
Alexander Friedland
117a13c3d8
Merge branch 'master' into 1956-redemption-link-is-not-displayed-in-the-mobile-version 2022-06-01 10:40:56 +02:00
ogerly
119b8cdb96 remove computed learnMore 2022-06-01 10:37:32 +02:00
ogerly
7c3cfd508f fixed stylelint 2022-06-01 10:18:40 +02:00
ogerly
cb7e3df9e6 learn more button add href and locales 2022-06-01 10:17:34 +02:00
ogerly
8c81d2fe49 add button variant from primary to gradido 2022-06-01 09:46:26 +02:00
ogerly
4f15e4e3cd add href for front button link to gradido 2022-06-01 09:44:14 +02:00
ogerly
4fd13f8e32 fixed test, fixed lint 2022-06-01 08:17:20 +02:00
ogerly
922e44adcd remove gray box and back link 2022-06-01 08:15:13 +02:00
ogerly
d1d2ce9565 fixed redeem link is mobile start false 2022-06-01 07:49:57 +02:00
ogerly
d12f31f62a change locales 2022-05-31 15:51:08 +02:00
ogerly
8cda603324 change footer icon color to #383838 2022-05-31 15:45:04 +02:00
ogerly
eebc4421c1 remove save login checkbox locales 2022-05-31 15:40:33 +02:00
ogerly
0fea0a092b remove save login checkbox from login page 2022-05-31 15:38:53 +02:00
Wolfgang Huß
8050b54a0b Fix locale sentence 2022-05-30 15:34:35 +02:00
Wolfgang Huß
5ea093a613 Remove comment 2022-05-30 15:25:22 +02:00
Wolfgang Huß
58e61fa140 Cleanup 2022-05-30 15:10:57 +02:00
Wolfgang Huß
ac7fe1172f Change locale identifiers from 'site.thx.*' to 'message.*' 2022-05-30 15:04:52 +02:00
Wolfgang Huß
4091413847 Remove thx page 2022-05-30 13:50:31 +02:00
Wolfgang Huß
eb34a9f6df Refactor test for ResetPassword.vue, fix 'only' 2022-05-30 13:25:22 +02:00