6189 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Moriz Wahl	15a9af4552	Merge branch 'master' into admin-email-confirmation	2022-02-11 16:29:05 +01:00
Alexander Friedland	2963306b9e	Merge pull request #1460 from gradido/833-Old-Error-is-shown-for-a-second-even-if-Transaction-is-successful ... 833 old error is shown for a second even if transaction is successful	2022-02-11 16:20:19 +01:00
Moriz Wahl	d3136adf33	linting	2022-02-11 15:27:23 +01:00
Moriz Wahl	8796e683d7	Merge branch 'master' into 833-Old-Error-is-shown-for-a-second-even-if-Transaction-is-successful	2022-02-11 15:25:53 +01:00
Moriz Wahl	e9149d9644	Merge branch 'master' into admin-email-confirmation	2022-02-11 15:05:06 +01:00
Moriz Wahl	5dafcb6890	Merge pull request #1446 from gradido/fix-email-spelling ... fix: Wrong Email Spelling in German	2022-02-11 15:04:52 +01:00
Moriz Wahl	14373ff302	Merge branch 'master' into admin-email-confirmation	2022-02-11 15:03:29 +01:00
Moriz Wahl	ec42f7239e	Merge branch 'master' into fix-email-spelling	2022-02-11 14:56:37 +01:00
Moriz Wahl	6cce2cf7ac	Merge pull request #1445 from gradido/fix-redirect-after-register ... fix: Redirect to Login after Register	2022-02-11 14:56:23 +01:00
Moriz Wahl	a347b337c6	take createdAt if updatedAt is not present	2022-02-11 14:55:31 +01:00
Moriz Wahl	f2e2c495ed	Merge branch 'master' into fix-redirect-after-register	2022-02-11 14:43:53 +01:00
Moriz Wahl	89740b38dd	Merge pull request #1443 from gradido/split-table-component ... refactor: Split User Table Component in Admin Interface	2022-02-11 14:43:33 +01:00
ogerly	5319f6de1e	remove string 'recipiant not known' to 'recipiant not known'	2022-02-11 12:10:00 +01:00
ogerly	7c7339e85b	send variable error by send to set in false, remove string 'recipiant not known' to 'recipiant not known'	2022-02-11 12:09:45 +01:00
ogerly	c12a1c469d	remove string 'recipiant not known' to 'recipiant not known'	2022-02-11 11:56:19 +01:00
Moriz Wahl	566a8a2af0	Merge branch 'master' into fix-email-spelling	2022-02-10 08:38:53 +01:00
Moriz Wahl	e29543ff46	Merge branch 'master' into fix-redirect-after-register	2022-02-10 08:38:22 +01:00
Moriz Wahl	1218915c1f	Merge branch 'master' into split-table-component	2022-02-10 08:38:07 +01:00
Moriz Wahl	0a545c5fbe	fix missing negator	2022-02-10 08:14:58 +01:00
Moriz Wahl	7e54251f71	display coorect date when the last confirmation email was sent	2022-02-10 08:08:48 +01:00
Moriz Wahl	26e2ba448a	long datetime format with long weekday and month	2022-02-10 08:07:15 +01:00
Moriz Wahl	9f51438b61	fix English time	2022-02-10 08:06:19 +01:00
Moriz Wahl	b3be4f664a	add date of last email confirmation send to admin user	2022-02-10 08:05:25 +01:00
Moriz Wahl	2c88bc0383	remove query for checkEmail as it is included in the user model now	2022-02-10 07:32:39 +01:00
Ulf Gebhardt	89a8c25b44	Merge pull request #1447 from gradido/v1.6.3 ... v1.6.3	2022-02-09 20:09:21 +01:00
Ulf Gebhardt	275ca14692	v1.6.3	2022-02-09 19:37:52 +01:00
Moriz Wahl	9e49ddab18	Merge branch 'master' into split-table-component	2022-02-09 12:24:37 +01:00
Moriz Wahl	32fdd77ac7	fix: Wrong Email Spelling in German	2022-02-09 12:23:07 +01:00
Moriz Wahl	f3cad44878	fix: Redirect to Login after Register	2022-02-09 12:05:55 +01:00
Alexander Friedland	1195e5ad90	Merge pull request #1442 from gradido/register-button-refactor ... add .btn-outline-secondary in scss	2022-02-09 11:48:06 +01:00
Moriz Wahl	1644c2938a	coverage admin interface 94%	2022-02-09 11:07:16 +01:00
Moriz Wahl	e3cff7fe7b	test toggle table row mixin	2022-02-09 11:06:33 +01:00
ogerly	b0da7e4360	add .btn-outline-secondary in scss	2022-02-09 10:41:47 +01:00
Moriz Wahl	c6a469e08f	remove user table	2022-02-09 10:18:22 +01:00
Moriz Wahl	ea6bab0823	selected users table	2022-02-09 10:17:36 +01:00
Moriz Wahl	1100e942e4	select users table	2022-02-09 10:10:09 +01:00
Moriz Wahl	a53864a72f	move css	2022-02-09 10:09:52 +01:00
Moriz Wahl	547ce903a6	fix test	2022-02-09 09:57:36 +01:00
Moriz Wahl	9ef575d6b1	open creations table	2022-02-09 09:50:17 +01:00
Alexander Friedland	67181263ed	Merge pull request #1440 from gradido/profil-settings-distance ... Profil settings and footer refactor	2022-02-09 09:45:52 +01:00
Moriz Wahl	d0a189b329	toggle row details as mixin	2022-02-09 09:02:48 +01:00
Moriz Wahl	7b76e18444	localize creation confirm table head	2022-02-09 08:37:01 +01:00
Moriz Wahl	ae2d5355d6	User Search Table	2022-02-09 08:21:07 +01:00
ogerly	81b3dc08ae	margin footer refactor, more margin to top	2022-02-08 20:51:55 +01:00
ogerly	cbaa0162b9	profil settings header info refactor style	2022-02-08 20:48:40 +01:00
Ulf Gebhardt	529066f8e1	Merge pull request #1438 from gradido/v1.6.2 ... v1.6.2	2022-02-08 16:40:11 +01:00
Ulf Gebhardt	0b874235a9	v1.6.2	2022-02-08 16:29:18 +01:00
Hannes Heine	04c93d051f	Merge pull request #1437 from gradido/update_changelog_lib ... updated_changelog_library	2022-02-08 16:23:01 +01:00
Ulf Gebhardt	38bf05887f	updated changelog library	2022-02-08 16:16:10 +01:00
Alexander Friedland	bd7aab1437	Merge pull request #1416 from gradido/1401-Admin-interface-does-user-have-member-area ... admin interface does user have member area	2022-02-08 16:08:06 +01:00