Commit Graph

3 Commits (feature/saml-login)

Author SHA1 Message Date
Deepak Prabhakara 40e915b5f1 Merge branch 'main' into feature/copy-add-identity-provider
# Conflicts:
#	pages/api/auth/[...nextauth].tsx
#	pages/api/auth/forgot-password.ts
#	pages/settings/security.tsx
#	prisma/schema.prisma
#	public/static/locales/en/common.json
2021-11-10 12:34:40 +00:00
Peer Richelsen e33962686e
minor changes to booking page and navtabs (#832) 2021-09-30 20:59:34 +01:00
Omar López a04336ba06
Added booking tabs, type fixing and refactoring (#825)
* More type fixes

* More type fixes

* Type fixes

* Adds inputMode to email fields

* Added booking tabs

* Adds aditional notes to bookings
2021-09-29 22:33:18 +01:00