9258 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ogerly	bccc52adef	merge #2005-Basic-Header, resolve conflict	2022-07-05 11:14:21 +02:00
ogerly	fd61478c70	small text in header info alert	2022-07-05 11:12:28 +02:00
ogerly	e0e75a661a	fix lint and stylelint	2022-07-05 09:54:33 +02:00
ogerly	c68bcc81b8	fix lint and stylelint	2022-07-05 09:52:39 +02:00
ogerly	004c76d82e	first step, new sidebar menu	2022-07-05 09:01:07 +02:00
ogerly	dc92199f4c	new navbar, first step	2022-07-04 10:58:53 +02:00
ogerly	baf3092ac0	Texts commented out	2022-07-02 08:53:00 +02:00
ogerly	9e81735345	template distribution preparation 2	2022-07-02 08:43:45 +02:00
ogerly	1b98280ba4	template distribution preparation	2022-07-02 08:43:03 +02:00
Moriz Wahl	1bb06f5ad4	Merge pull request #2021 from gradido/v1.10.1 ... release: 1.10.1	2022-06-30 16:04:07 +02:00
Moriz Wahl	9c98087874	release: 1.10.1	2022-06-30 15:55:23 +02:00
Alexander Friedland	f49bb5b1c5	Merge pull request #2001 from gradido/1736-When-session-is-expired-redeem-link-is-not-transported ... automatic session logout with info modal	2022-06-30 15:53:57 +02:00
Moriz Wahl	648b905d63	fix test	2022-06-30 15:44:49 +02:00
ogerly	ca8a3a0331	fix lint	2022-06-30 15:30:13 +02:00
ogerly	31e8f11f79	change locales static 10 Minutes	2022-06-30 15:29:11 +02:00
Alexander Friedland	286c717a3a	Update frontend/src/locales/de.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-06-30 14:49:28 +02:00
Alexander Friedland	4134e7593e	Update frontend/src/locales/en.json ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-06-30 14:49:19 +02:00
Alexander Friedland	0fdccda597	Update frontend/src/store/store.test.js ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-06-30 14:20:17 +02:00
Alexander Friedland	ef373e6ae0	Update frontend/src/store/store.test.js ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-06-30 14:13:54 +02:00
Alexander Friedland	fa32054f96	Update frontend/src/components/SessionLogoutTimeout.spec.js ... Co-authored-by: Wolfgang Huß <wolle.huss@pjannto.com>	2022-06-30 14:11:22 +02:00
ogerly	0e3f6a4d73	change JWT_EXPIRES_IN to 10m	2022-06-30 13:51:40 +02:00
ogerly	7e0374586e	delete mp3 in public/sound	2022-06-30 12:25:21 +02:00
Moriz Wahl	41c266b022	fix locales	2022-06-30 11:28:54 +02:00
Moriz Wahl	2cdaf97f05	remove emacs artifact	2022-06-30 11:20:51 +02:00
Moriz Wahl	81ee4a1011	Merge branch '1736-When-session-is-expired-redeem-link-is-not-transported' of github.com:gradido/gradido into 1736-When-session-is-expired-redeem-link-is-not-transported	2022-06-30 11:19:39 +02:00
Moriz Wahl	b2fff23b6b	raise coverage, try to test timers	2022-06-30 11:19:19 +02:00
Moriz Wahl	fddaa99ada	use vue-timers as recommended	2022-06-28 16:07:45 +02:00
Alexander Friedland	f179148ab7	Merge branch 'master' into 1736-When-session-is-expired-redeem-link-is-not-transported	2022-06-28 13:35:41 +02:00
Alexander Friedland	a8cdd55f6b	Merge pull request #1998 from gradido/1910-carousel-should-also-have-changing-texts ... 1910 separate text for the slideshow images.	2022-06-27 15:52:01 +02:00
Alexander Friedland	e6a408273a	change text	2022-06-27 15:43:31 +02:00
ogerly	cf543641d7	change text in modal 2	2022-06-27 10:29:10 +02:00
Alexander Friedland	829a2c2570	Merge branch 'master' into 1910-carousel-should-also-have-changing-texts	2022-06-27 09:09:10 +02:00
ogerly	346084f797	change text in modal	2022-06-27 09:05:38 +02:00
ogerly	5dd1ec846d	fix locales	2022-06-27 08:52:33 +02:00
Alexander Friedland	94b866c84d	Merge branch 'master' into 1736-When-session-is-expired-redeem-link-is-not-transported	2022-06-24 13:28:50 +02:00
ogerly	32bc865ca2	change modal style	2022-06-24 13:27:59 +02:00
clauspeterhuebner	cc442d8bc9	Merge pull request #1996 from gradido/origin/1921-rebase_from_master ... Origin/1921 additional parameter checks for createContributionLinks	2022-06-24 12:34:45 +02:00
ogerly	5763c5e350	set closeTime with diff count	2022-06-24 12:23:32 +02:00
Claus-Peter Hübner	c1eef4a464	Merge branch 'origin/1921-rebase_from_master' of github.com:gradido/gradido into 1921-rebase_from_master	2022-06-24 00:13:07 +02:00
Claus-Peter Hübner	e1fca7fb14	correct version of database	2022-06-24 00:07:37 +02:00
ogerly	8673def9b1	add test store token and tokenTime	2022-06-23 13:50:47 +02:00
ogerly	6b670c7878	add test example	2022-06-23 10:59:05 +02:00
ogerly	ee80c65643	add logout emit an click event button	2022-06-23 07:24:43 +02:00
ogerly	c20e780695	add component SessionLogoutTimeout, add sound	2022-06-23 07:05:58 +02:00
clauspeterhuebner	a675364ba0	Delete .project	2022-06-23 02:50:06 +02:00
clauspeterhuebner	e2149a6ce4	Delete .dbeaver directory	2022-06-23 02:49:16 +02:00
clauspeterhuebner	e1fd44a295	Merge branch 'master' into origin/1921-rebase_from_master	2022-06-23 02:45:49 +02:00
Claus-Peter Hübner	47772a37b2	rework PR-comments	2022-06-23 02:42:20 +02:00
Alexander Friedland	9d82cc081a	Merge branch 'master' into 1736-When-session-is-expired-redeem-link-is-not-transported	2022-06-22 23:14:34 +02:00
ogerly	fae0685509	step 1 automatic logout of session after 10 minutes, last 60 seconds warning modal	2022-06-22 22:41:26 +02:00