Commit Graph

605 Commits (4becb21d53a1b3561f11cb85d0db98e068956d25)

Author SHA1 Message Date
Mihai C 8500a8dd64
Update pages/settings/teams.tsx
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-02 13:31:59 +03:00
mihaic195 2008ad263c
fix: ssr session on teams page 2021-07-02 13:28:33 +03:00
Bailey Pumfleet 850f49df5e
Merge pull request #335 from oscard0m/readme-prisma-command-remove-preview-flag 2021-07-01 22:26:55 +01:00
Oscar Dominguez 0cd28ab23c
docs(readme): prisma db push is not in preview anymore 2021-07-01 17:11:12 +02:00
Bailey Pumfleet d701d3905d
Merge pull request #293 from emrysal/feature/scheduling
Feature/scheduling
2021-07-01 13:52:08 +01:00
Alex van Andel a7173a32a0 Updated booking link to proper username 2021-07-01 10:31:38 +00:00
mihaic195 6f64df3e75
lint 2021-07-01 12:51:51 +03:00
mihaic195 6463b3ba37
fix codacy suggestions 2021-07-01 12:47:12 +03:00
Mihai C 715033f4e1
Update pages/settings/teams.tsx
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:31:40 +03:00
Mihai C 9eff620ee0
Update pages/settings/teams.tsx
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:30:51 +03:00
Mihai C 4a1e8cfbf7
Update pages/settings/teams.tsx
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:30:40 +03:00
Mihai C 0fb2984138
Update pages/settings/teams.tsx
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:30:31 +03:00
Mihai C b71cc82a0e
Update pages/settings/teams.tsx
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:30:20 +03:00
Mihai C 769f36f8d5
Update pages/settings/teams.tsx
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:30:10 +03:00
Mihai C b91d021fc8
Update pages/api/teams.ts
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:29:55 +03:00
mihaic195 1122def2c0
update fetch to also handle errors 2021-07-01 11:47:27 +03:00
Alex van Andel 6aa8df7fcf If no availability set, default to user prefs 2021-06-30 15:57:56 +00:00
Alex van Andel a28cb455f1 Fixed bug that kept the date enabled when the time slot was less than 30m 2021-06-30 15:41:38 +00:00
Alex van Andel bfc7cce688 Make sure the slots equal the month and date of the invitee so we can check isSame with freebusy 2021-06-30 15:27:49 +00:00
Bailey Pumfleet 80898ea706 Revamp bookings page 2021-06-30 15:14:10 +01:00
mihaic195 8b00475b27
remove unnecessary guard 2021-06-30 16:52:18 +03:00
mihaic195 e10030e18b
fix api 500 and redirect to login if not authenticated when accessing /settings/team 2021-06-30 16:48:34 +03:00
Alex van Andel 9fe11ea10d Make sure the currently selected date is active 2021-06-30 02:41:22 +00:00
Alex van Andel f7f5e2cc17 Re-instated ResetPasswordRequest, almost oops 2021-06-30 02:05:24 +00:00
Alex van Andel 90e4091b06 Rehydrated yarn.lock file 2021-06-30 01:55:06 +00:00
Alex van Andel fdee619fbf Removed changes to calendso.yaml 2021-06-30 01:50:10 +00:00
Alex van Andel ee603a0a27 Added migration for Availability and related 2021-06-30 01:48:23 +00:00
Alex van Andel 8c589b9dc1 Merge branch 'main' into feature/scheduling 2021-06-30 01:45:24 +00:00
Alex van Andel e78a34e2ce Implements slot logic with the DatePicker, more tests for slots 2021-06-30 01:35:08 +00:00
nicolas 313ee0376e Fixed padding 2021-06-30 00:53:37 +02:00
nicolas 8accc3b775 Fixed padding 2021-06-30 00:50:34 +02:00
Alex van Andel 0da99f0d07 Removed code bloat, fixed tests 2021-06-29 22:35:13 +00:00
nicolas 88db124f47 Fixed padding 2021-06-30 00:35:05 +02:00
nicolas e49c636a13 Fixed padding 2021-06-30 00:31:30 +02:00
nicolas ae3aa275f7 fixed padding 2021-06-30 00:16:25 +02:00
nicolas 7568071334 removed div 2021-06-30 00:11:16 +02:00
Alex van Andel 5d30586a24 Heavily simplified the startTime and endTime display by removing dayjs from SetTimesModal 2021-06-29 22:00:25 +00:00
nicolas f91fdd16cf Use HTML to allow line breaks in outlook 2021-06-29 23:47:50 +02:00
nicolas 098b95ef55 Introduced CalEventParser to acquire rich descriptions for events in integrations 2021-06-29 23:43:18 +02:00
Bailey Pumfleet 3aa1e1716d
Merge pull request #327 from Malte-D/hotfix/book-user
hotfix for api/book/user
2021-06-29 17:20:49 +01:00
Malte Delfs dfb9870894 hotfix 2021-06-29 18:17:09 +02:00
Bailey Pumfleet 51c0556d30 Hide Calendso branding 2021-06-29 17:08:55 +01:00
Bailey Pumfleet 89abba1d53
Merge pull request #320 from Nico-J/bugfix/zoom-invalid-token
Fixed Zoom Auth
2021-06-29 16:19:28 +01:00
Bailey Pumfleet 099186fdd9
Merge branch 'main' into bugfix/zoom-invalid-token 2021-06-29 16:19:20 +01:00
Bailey Pumfleet 0f840ac859
Merge pull request #325 from FarazPatankar/main 2021-06-29 14:13:04 +01:00
Faraz Patankar 272cee28d1 add railway button 2021-06-29 16:28:42 +04:00
femyeda 726d211f27 attach hangouts location to invitee and organizer email notification 2021-06-29 07:16:20 -05:00
femyeda e714bd5b8e use google events conference data version 1
- fix issue where google meet details were no longer add to the created event
2021-06-29 07:16:20 -05:00
Bailey Pumfleet 113185e089
Merge pull request #323 from mihaic195/fix/add-login-link-on-forgot-password-page 2021-06-29 09:50:56 +01:00
Bailey Pumfleet 9ad1d4fcda
Merge pull request #322 from femyeda/hotfix/user-can-book-a-day-in-past 2021-06-29 09:49:49 +01:00