941 Commits

Author	SHA1	Message	Date
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	c1f5a425b4	Update en.json	2021-09-24 13:14:51 +02:00
ogerly	05bab6e757	remove formal totale sum	2021-09-24 13:10:04 +02:00
ogerly	4c574c1081	add lacales, fix locales, fix lint	2021-09-24 12:27:39 +02:00
ogerly	092d3f6f5d	Better explanation and presentation of the calculation of the total sum with the inclusion of decay	2021-09-24 12:13:48 +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	d5c1d3bca0	class clo to element b-col	2021-09-24 11:33:49 +02:00
Moriz Wahl	f792d8e02b	Merge pull request #889 from gradido/hadnle-expired-jwt ... feat: Redirect to Login when JWT has expired	2021-09-24 11:17:53 +02:00
ogerly	62f6b67c2b	remove style from element	2021-09-24 11:07:15 +02:00
ogerly	23996c8ec5	change b-row	2021-09-24 10:43:35 +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	0e61662119	feat: Redirect to Login when JWT has expired	2021-09-23 14:49:30 +02:00
ogerly	ab16f6f16b	fix locales	2021-09-23 14:01:04 +02:00
ogerly	2ac14c460a	fix row and col, remove fixed width	2021-09-23 13:55:15 +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
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
Ulf Gebhardt	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