11 Commits

Author	SHA1	Message	Date
ogerly	2ea7cf6705	merge #1588 and resolve conflicts	2022-03-21 14:57:43 +01:00
ogerly	f8882fa63a	remove computed	2022-03-21 14:41:50 +01:00
Ulf Gebhardt	c83959fc58	Merge branch 'master' into 1319-email-optin	2022-03-21 12:30:57 +01:00
ogerly	6d257825e2	add redeemCode to login button	2022-03-21 12:11:19 +01:00
elweyn	f2e2c2d708	Withdrew resetFailed block since it redirects directly to the forgot-password page.	2022-03-15 08:24:22 +01:00
Ulf Gebhardt	e22bf6f497	additional checks, ... fix dynamic $t values by ignoring our occurences	2022-03-15 03:11:35 +01:00
elweyn	a4aabfc369	Changes coming from new changes added in here.	2022-03-11 08:45:31 +01:00
elweyn	af3c8a4e36	Resolve merge conflicts.	2022-03-11 08:16:01 +01:00
Moriz Wahl	574c1cf203	rename route for reset-password	2022-03-07 19:23:08 +01:00
Moriz Wahl	bcc3ca4907	rename password with forgot-password	2022-03-07 19:07:14 +01:00
Moriz Wahl	c790211870	remove views folder	2022-03-07 17:29:32 +01:00