511 Commits

Author SHA1 Message Date
ogerly
f5915d0ada setting changed to settings, remove delete rows 2021-09-28 09:41:07 +02:00
ogerly
4dec84321a Cleaned up locales for settings and adjusted texts in files 2021-09-27 15:35:17 +02:00
ogerly
7164b53407 fix bug col to cols on <b-col> 2021-09-24 14:24:18 +02:00
Alexander Friedland
441ab98711
Merge branch 'master' into 826-Different-Design-of-GDD-and-GDT-Lists 2021-09-24 13:35:09 +02:00
Alexander Friedland
d5ee9c96fb
Merge pull request #815 from gradido/636-Display-of-Decay-in-Transaction-Details
decay calculation is calculated
2021-09-24 13:23:18 +02:00
Alexander Friedland
922b823459
Merge pull request #887 from gradido/850-851-859-Borders-on-Profile-Page
round corners removed from profile settings page
2021-09-24 12:10:37 +02:00
ogerly
62f6b67c2b remove style from element 2021-09-24 11:07:15 +02:00
ogerly
eca56af32a fix lint 2021-09-24 09:18:51 +02:00
ogerly
980fcc34bc border radius only right, no borders color 2021-09-24 09:08:58 +02:00
Moriz Wahl
7939202997 do not trigger submit after click, but only on submit 2021-09-23 12:51:43 +02:00
Moriz Wahl
2019422cb9 remove second import of vee-validate 2021-09-23 12:11:16 +02:00
Moriz Wahl
bd42480fc0 fix worng variable name 2021-09-23 12:09:34 +02:00
Moriz Wahl
25833f58b4 Merge branch 'master' into queries-to-mutations 2021-09-23 12:02:30 +02:00
Moriz Wahl
95a667046b fix misspelling 2021-09-23 11:56:12 +02:00
Moriz Wahl
1be5dd50b6 fix misspelling 2021-09-23 11:51:07 +02:00
ogerly
b7ba360c7e round corners removed from profile settings page 2021-09-23 09:18:07 +02:00
ogerly
dbc1e22741 The style of the GDT list has been adapted to the style of the GDD list. 2021-09-23 09:05:09 +02:00
elweyn
09e87526de Added a success message for language switch in profile. 2021-09-22 12:29:21 +02:00
elweyn
3ca200bb96 Added a success message in case where language has been switched. 2021-09-22 12:12:28 +02:00
elweyn
a0b35dad23 Changed the method name to something a bit more meaningfull. 2021-09-22 11:36:30 +02:00
elweyn
8a5b552a11 In case of language switch success change language in store. 2021-09-22 11:32:46 +02:00
elweyn
a404be1cfb Added Email as parameter for the change language updateUserInfos. 2021-09-22 11:02:20 +02:00
Moriz Wahl
62142710f8 send coins as Mutations 2021-09-20 12:25:04 +02:00
Moriz Wahl
5ded9f60be createUser as Mutation 2021-09-20 12:02:17 +02:00
Moriz Wahl
c401344193 fix: language can be changed in profile 2021-09-20 11:50:26 +02:00
Moriz Wahl
e6d386c598 refactor: Queries to Mutations 2021-09-20 11:22:00 +02:00
ogerly
cdbd5f59b5 after remove conflicts, fix lint 2021-09-20 08:58:58 +02:00
Alexander Friedland
e8e0eb4d8d
Merge branch 'master' into 636-Display-of-Decay-in-Transaction-Details 2021-09-20 08:29:04 +02:00
ogerly
00219c049e decay calculation is calculated and displayed at the transaction in a more user-friendly way 2021-09-16 15:54:35 +02:00
Moriz Wahl
ecdeb94fc0 fix test 2021-09-16 13:37:38 +02:00
Moriz Wahl
eca81883a0 Merge branch 'master' into apollo-clicktipp-connector 2021-09-16 13:21:38 +02:00
elweyn
2b73bd3019 Changed the unsubscribed mutation since we don't need language hier. 2021-09-16 13:03:20 +02:00
elweyn
123f45c853 Merge branch '531-Newsletter-subscribe-status-change-in-user-profile' into apollo-clicktipp-connector 2021-09-16 12:18:06 +02:00
Moriz Wahl
d3af552339 refactor newsletter component and tests 2021-09-16 12:13:23 +02:00
elweyn
33d7a05f66 Initial state of store state language is null. 2021-09-16 11:25:03 +02:00
elweyn
ad1aa402f4 KlickTipp subscribe and unsubscribe, merge master. 2021-09-16 10:38:08 +02:00
Moriz Wahl
3c061bcb8d feat: Increase Coverage 2021-09-15 15:23:59 +02:00
Moriz Wahl
5c7ddb0ce4
Merge pull request #806 from gradido/refactor-pagination-buttons
refactor: Pagination Buttons
2021-09-15 15:08:15 +02:00
ogerly
11384e4060 style fix, locale fix, all settings fix 2021-09-15 15:01:14 +02:00
ogerly
f619a3d1dc add BFormCheckbox switch for edit, fix test for BFormCheckbox switch 2021-09-15 07:28:44 +02:00
ogerly
8e508b7f84 add newsletter UserCard_Newsletter.vue and UserCard_Newsletter.spec.js 2021-09-15 06:22:02 +02:00
ogerly
5dd8444ca2 add newsletter settings 2021-09-14 21:35:52 +02:00
Moriz Wahl
39fad42571 better tests for GDD Transaction List 2021-09-14 17:57:46 +02:00
Moriz Wahl
8af43bd788 bug fixes 2021-09-14 17:42:57 +02:00
Moriz Wahl
4f5ca22363 refactoring is working 2021-09-14 17:28:40 +02:00
ogerly
007c1f00d5 register and settings add components langunage fix 2021-09-14 16:40:19 +02:00
ogerly
d5a37f23b6 delete files with username 2021-09-14 16:27:49 +02:00
Moriz Wahl
7ede572f4b refactor: Pagination Buttons 2021-09-14 16:25:14 +02:00
Moriz Wahl
0427a31790 Merge branch 'master' into 557-Switch-language-only-in-user-profile 2021-09-14 14:03:31 +02:00
Moriz Wahl
6f4d15ecf1 fix test for register.spec.js 2021-09-14 13:55:45 +02:00