Commit Graph

1826 Commits (202db9315f0623208aa9d7ceb1d4e0722b490f29)

Author SHA1 Message Date
Bailey Pumfleet a1eeb403ea
Merge pull request #321 from femyeda/google-meet
Add google meet link to email notifications
2021-07-07 10:49:41 +01:00
Bailey Pumfleet 5112347293
Merge branch 'main' into google-meet 2021-07-07 10:46:42 +01:00
Bailey Pumfleet 236b37de48
Merge pull request #345 from emrysal/feature/prisma-helpers
Adds prisma helper function for whereAndSelect
2021-07-06 22:23:38 +01:00
Bailey Pumfleet 43f899582f Fix issue where user ID is not fetched 2021-07-06 22:09:53 +01:00
Alex van Andel de74d85fac Remove --experimental-vm-modules & fix Codacy 2021-07-06 18:33:25 +00:00
Alex van Andel e08815ce78 Added support for deep selecting 2021-07-06 18:20:25 +00:00
Alex van Andel 47d7634638 Adds prisma helper function whereAndSelect 2021-07-06 16:51:34 +00:00
Alex van Andel 496fcdfabc Minimized msgraph calls while event listing by batching 2021-07-05 19:50:54 +00:00
mihaic195 e315b272f5
Merge branch 'main' into fix/teams-create-error-and-unauthenticated-request 2021-07-05 10:18:28 +03:00
Bailey Pumfleet 90d6f8faee
Add Docker to README 2021-07-04 20:36:03 +01:00
Peer Richelsen 749978798b fixed layout for confirmation screen on mobile 2021-07-03 22:27:56 +02:00
Peer Richelsen 58c1c935c2 moved powered by calendso to center on mobile 2021-07-03 22:22:56 +02:00
Peer Richelsen b61cdbf40c removed top margin and shadow for mobile layout 2021-07-03 22:19:12 +02:00
Bailey Pumfleet bdf736c70f
Merge pull request #338 from emrysal/main 2021-07-03 19:53:35 +01:00
Bailey Pumfleet dc61448191
Merge pull request #339 from emrysal/feature/editorconfig 2021-07-03 19:52:05 +01:00
Alex van Andel f69a961787 Added .editorconfig file as suggested in #270 2021-07-03 17:02:26 +00:00
Alex van Andel b136941948 Fixes #337: Event times ordered seemingly random 2021-07-03 14:24:30 +00:00
Peer_Rich d2d0dea858
added more product hunt badges 2021-07-03 11:22:02 +02:00
Mihai C dcf2744566
Update pages/_app.tsx
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-02 13:32:45 +03:00
Mihai C b15ef1d8b0
Update pages/settings/teams.tsx
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-02 13:32:27 +03:00
Mihai C 2af9ed55a7
Update pages/settings/teams.tsx
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-02 13:32:11 +03:00
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