972 Commits

Author SHA1 Message Date
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
ogerly
691a8c4dad Decay better explained in transactional info 2021-09-23 08:55:45 +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
einhorn_b
b196ef78b8 Merge branch 'master' into frontend_commit_hash 2021-09-20 11:40:49 +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
einhornimmond
675917a8c0 split test in two 2021-09-17 16:37:39 +02:00
einhornimmond
db15a5da4e add tests for commit hash 2021-09-17 13:19:10 +02:00
ogerly
e7d925b794 transmit and receive, calculation of the decay as text: 'total' 2021-09-17 09:07:01 +02:00
5038cff0bf
Merge pull request #811 from gradido/webpack_update
webpack update
2021-09-16 18:19:40 +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
4cdbea7f99 feat: Release 1.4.0 2021-09-16 15:53:25 +02:00
Moriz Wahl
ecdeb94fc0 fix test 2021-09-16 13:37:38 +02:00
Moriz Wahl
f438012099 linting 2021-09-16 13:26:14 +02:00
Moriz Wahl
eca81883a0 Merge branch 'master' into apollo-clicktipp-connector 2021-09-16 13:21:38 +02:00
Moriz Wahl
ec12a28f81 sort locales 2021-09-16 13:19:49 +02:00
elweyn
0d0c463c48 Lint fixe remove. 2021-09-16 13:15:14 +02:00
elweyn
2b73bd3019 Changed the unsubscribed mutation since we don't need language hier. 2021-09-16 13:03:20 +02:00
einhornimmond
827cdd636f remove old code 2021-09-16 13:01:00 +02:00
Moriz Wahl
a45a2baa86
Merge pull request #809 from gradido/locale-management
feat: Locale Management
2021-09-16 12:58:29 +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
e31b7f69f8 newsletter commit in store after login 2021-09-16 12:14:40 +02:00
Moriz Wahl
d3af552339 refactor newsletter component and tests 2021-09-16 12:13:23 +02:00
e9c30a65c2
install bash & jq since they are not present on the alpine image. Install it only for test so we do not bloat our production image 2021-09-16 11:54:53 +02:00
elweyn
33d7a05f66 Initial state of store state language is null. 2021-09-16 11:25:03 +02:00
Moriz Wahl
8b16e772c1 newsletterState in store 2021-09-16 11:14:22 +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
einhornimmond
ba1f3c0fc6 removed old code 2021-09-15 15:06:52 +02:00
ogerly
11384e4060 style fix, locale fix, all settings fix 2021-09-15 15:01:14 +02:00
einhornimmond
1e792c32e3 Merge branch 'frontend_commit_hash' of github.com:gradido/gradido into frontend_commit_hash 2021-09-15 14:49:04 +02:00
28ee08c819
webpack update 2021-09-15 14:34:49 +02:00
f9af5f961f
env/process.env working in docker & without 2021-09-15 14:30:11 +02:00
Moriz Wahl
ddb8d2aef5 use no slash 2021-09-15 13:28:23 +02:00
Moriz Wahl
1b957466c7 getting CI worklfow running 2021-09-15 13:11:22 +02:00
Moriz Wahl
aba4f4d20e feat: Unify and Sort Locales 2021-09-15 11:58:35 +02:00
9cf1221040
update docker file to properly transmit cli parameters to vue 2021-09-15 10:28:10 +02:00