This website requires JavaScript.
2008ad263c
fix: ssr session on teams page
mihaic195
2021-07-02 13:28:33 +03:00
850f49df5e
Merge pull request #335 from oscard0m/readme-prisma-command-remove-preview-flag
Bailey Pumfleet
2021-07-01 22:26:55 +01:00
0cd28ab23c
docs(readme): prisma db push is not in preview anymore
Oscar Dominguez
2021-07-01 17:11:12 +02:00
d701d3905d
Merge pull request #293 from emrysal/feature/scheduling
Bailey Pumfleet
2021-07-01 13:52:08 +01:00
a7173a32a0
Updated booking link to proper username
Alex van Andel
2021-07-01 10:31:38 +00:00
6f64df3e75
lint
mihaic195
2021-07-01 12:51:51 +03:00
6463b3ba37
fix codacy suggestions
mihaic195
2021-07-01 12:47:12 +03:00
715033f4e1
Update pages/settings/teams.tsx
Mihai C and Bailey Pumfleet
2021-07-01 12:31:40 +03:00
9eff620ee0
Update pages/settings/teams.tsx
Mihai C and Bailey Pumfleet
2021-07-01 12:30:51 +03:00
4a1e8cfbf7
Update pages/settings/teams.tsx
Mihai C and Bailey Pumfleet
2021-07-01 12:30:40 +03:00
0fb2984138
Update pages/settings/teams.tsx
Mihai C and Bailey Pumfleet
2021-07-01 12:30:31 +03:00
b71cc82a0e
Update pages/settings/teams.tsx
Mihai C and Bailey Pumfleet
2021-07-01 12:30:20 +03:00
769f36f8d5
Update pages/settings/teams.tsx
Mihai C and Bailey Pumfleet
2021-07-01 12:30:10 +03:00
b91d021fc8
Update pages/api/teams.ts
Mihai C and Bailey Pumfleet
2021-07-01 12:29:55 +03:00
1122def2c0
update fetch to also handle errors
mihaic195
2021-07-01 11:47:27 +03:00
6aa8df7fcf
If no availability set, default to user prefs
Alex van Andel
2021-06-30 15:56:06 +00:00
a28cb455f1
Fixed bug that kept the date enabled when the time slot was less than 30m
Alex van Andel
2021-06-30 15:41:38 +00:00
bfc7cce688
Make sure the slots equal the month and date of the invitee so we can check isSame with freebusy
Alex van Andel
2021-06-30 15:27:49 +00:00
80898ea706
Revamp bookings page
Bailey Pumfleet
2021-06-30 15:14:10 +01:00
8b00475b27
remove unnecessary guard
mihaic195
2021-06-30 16:52:18 +03:00
e10030e18b
fix api 500 and redirect to login if not authenticated when accessing /settings/team
mihaic195
2021-06-30 16:48:34 +03:00
9fe11ea10d
Make sure the currently selected date is active
Alex van Andel
2021-06-30 02:41:22 +00:00
f7f5e2cc17
Re-instated ResetPasswordRequest, almost oops
Alex van Andel
2021-06-30 02:01:29 +00:00
90e4091b06
Rehydrated yarn.lock file
Alex van Andel
2021-06-30 01:55:06 +00:00
fdee619fbf
Removed changes to calendso.yaml
Alex van Andel
2021-06-30 01:49:35 +00:00
ee603a0a27
Added migration for Availability and related
Alex van Andel
2021-06-30 01:48:23 +00:00
8c589b9dc1
Merge branch 'main' into feature/scheduling
Alex van Andel
2021-06-30 01:45:24 +00:00
e78a34e2ce
Implements slot logic with the DatePicker, more tests for slots
Alex van Andel
2021-06-30 01:35:08 +00:00
313ee0376e
Fixed padding
nicolas
2021-06-30 00:53:37 +02:00
8accc3b775
Fixed padding
nicolas
2021-06-30 00:50:34 +02:00
0da99f0d07
Removed code bloat, fixed tests
Alex van Andel
2021-06-29 22:35:13 +00:00
88db124f47
Fixed padding
nicolas
2021-06-30 00:35:05 +02:00
e49c636a13
Fixed padding
nicolas
2021-06-30 00:31:30 +02:00
ae3aa275f7
fixed padding
nicolas
2021-06-30 00:16:25 +02:00
7568071334
removed div
nicolas
2021-06-30 00:11:16 +02:00
5d30586a24
Heavily simplified the startTime and endTime display by removing dayjs from SetTimesModal
Alex van Andel
2021-06-29 22:00:25 +00:00
f91fdd16cf
Use HTML to allow line breaks in outlook
nicolas
2021-06-29 23:47:50 +02:00
098b95ef55
Introduced CalEventParser to acquire rich descriptions for events in integrations
nicolas
2021-06-29 23:43:18 +02:00
3aa1e1716d
Merge pull request #327 from Malte-D/hotfix/book-user
Bailey Pumfleet
2021-06-29 17:20:49 +01:00
dfb9870894
hotfix
Malte Delfs
2021-06-29 18:17:09 +02:00
51c0556d30
Hide Calendso branding
Bailey Pumfleet
2021-06-29 17:08:55 +01:00
89abba1d53
Merge pull request #320 from Nico-J/bugfix/zoom-invalid-token
Bailey Pumfleet
2021-06-29 16:19:28 +01:00
099186fdd9
Merge branch 'main' into bugfix/zoom-invalid-token
Bailey Pumfleet
2021-06-29 16:19:20 +01:00
0f840ac859
Merge pull request #325 from FarazPatankar/main
Bailey Pumfleet
2021-06-29 14:13:04 +01:00
272cee28d1
add railway button
Faraz Patankar
2021-06-29 16:28:42 +04:00
726d211f27
attach hangouts location to invitee and organizer email notification
femyeda
2021-06-28 19:30:45 -05:00
e714bd5b8e
use google events conference data version 1
femyeda
2021-06-28 15:34:27 -05:00
113185e089
Merge pull request #323 from mihaic195/fix/add-login-link-on-forgot-password-page
Bailey Pumfleet
2021-06-29 09:50:56 +01:00
9ad1d4fcda
Merge pull request #322 from femyeda/hotfix/user-can-book-a-day-in-past
Bailey Pumfleet
2021-06-29 09:49:49 +01:00
39df7d61bc
fix: add login link on forgot password page
mihaic195
2021-06-29 11:45:54 +03:00
575747bcd3
Final thing to check is timezones, currently if I am in Kuala Lumpur the time is correct, but it jumps 8 hours due to being out of bound on Seoul.
Alex van Andel
2021-06-29 01:45:58 +00:00
d1bdac45eb
dont allow user to book a past date
femyeda
2021-06-28 19:39:08 -05:00
8020576b06
update message for not available
femyeda
2021-06-28 11:01:07 -05:00
f918f220eb
Fixed Zoom Auth
nicolas
2021-06-29 02:21:08 +02:00
f853865600
Merge pull request #319 from emrysal/hotfix/temporarily-recommend-NEXTAUTH_URL-for-vercel
Bailey Pumfleet
2021-06-28 23:13:54 +01:00
b4272ad7aa
Merge branch 'main' of github.com:calendso/calendso into feature/scheduling
Alex van Andel
2021-06-28 19:53:07 +00:00
588caa6394
Merge pull request #318 from emrysal/bugfix/add-migration-password-reset
Bailey Pumfleet
2021-06-28 18:48:11 +01:00
a17d477d20
Added NEXTAUTH_URL back to .env.example as it is required on Vercel
Alex van Andel
2021-06-28 17:47:40 +00:00
e6ce82867c
Added migration for ResetPasswordRequest
Alex van Andel
2021-06-28 15:39:45 +00:00
5ebd9d5270
Merge pull request #315 from emrysal/bugfix/fixes-phoneinput-crashing
Bailey Pumfleet
2021-06-28 15:11:54 +01:00
52e68b682c
Removed isOverride boolean, renamed 'Schedule' to 'Availability'
Alex van Andel
2021-06-28 04:24:15 +00:00
1eba242820
Compare busyTimes in UTC, re-implement hasErrors
Alex van Andel
2021-06-27 22:30:11 +00:00
698c64e657
Re-implemented * is all booked today in Slots() component
Alex van Andel
2021-06-27 22:02:27 +00:00
7030851efb
Merged with main, fixed issue that caused multiple AvailableTimes refreshes.
Alex van Andel
2021-06-27 21:28:35 +00:00
383ec64a7f
onChange callback got removed in eslint cleanups
Alex van Andel
2021-06-27 13:51:06 +00:00
c13e067f72
Merge pull request #314 from Malte-D/hotfix/booking
Malte Delfs
2021-06-26 19:53:45 +02:00
b5b480f7e2
hotfix for booking
Malte Delfs
2021-06-26 19:48:24 +02:00
aa2e35d68e
Merge pull request #311 from Nico-J/feature/zoom-event-location
Bailey Pumfleet
2021-06-25 16:52:52 +01:00
8394b12a71
Merge pull request #307 from femyeda/feat/cal-69/password-reset
Bailey Pumfleet
2021-06-25 16:52:36 +01:00
cc02558ac6
Merge pull request #310 from femyeda/fix-244-can-book-when-not-available
Bailey Pumfleet
2021-06-25 16:51:28 +01:00
e883ab591a
simplify expiry calculation, timezone unneccessary
femyeda
2021-06-25 09:23:32 -05:00
6fec24a69d
use lib folder
femyeda
2021-06-25 09:21:21 -05:00
ad657c0261
use proper response code
femyeda
2021-06-25 09:17:39 -05:00
2c29368337
fix: passwordResetLink uses correct page
femyeda
2021-06-25 09:16:24 -05:00
28edb86c14
Don't render location if there is none for now
Alex van Andel
2021-06-24 22:48:01 +00:00
bc47975316
Added zoom as an event location and fixed ESLint
nicolas
2021-06-25 00:26:55 +02:00
ef3274d8f3
Working version ready for testing
Alex van Andel
2021-06-24 22:15:18 +00:00
a53cdf2660
fix: issue where user could book a meeting when unavailable
femyeda
2021-06-24 16:20:16 -05:00
3c8b9da54d
fix: busy times are shown on booking
femyeda
2021-06-24 15:00:09 -05:00
dada6a3a79
Merge pull request #309 from Malte-D/hotfix/booking-no-await
Malte Delfs
2021-06-24 20:42:06 +02:00
9c3eea5257
booking hotfix
Malte Delfs
2021-06-24 20:41:26 +02:00
c7bdecbad1
Merge pull request #308 from Malte-D/hotfix/mail-async
Malte Delfs
2021-06-24 19:36:34 +02:00
2f20cf2968
made sendEmail async
Malte Delfs
2021-06-24 19:30:39 +02:00
24f10e4f29
Merge pull request #296 from Malte-D/feature/refresh-tokens-and-error-handling
Bailey Pumfleet
2021-06-24 17:32:38 +01:00
646ff4a107
eslint fixes
Malte Delfs
2021-06-24 18:12:22 +02:00
917b2c4821
Merge branch 'main' into feature/refresh-tokens-and-error-handling
Malte Delfs
2021-06-24 17:49:15 +02:00
ab1298e2ca
Allow user to reset password
femyeda
2021-06-24 10:59:11 -05:00
ed92451126
The page was being rendered during the async router.replace call (#306 )
Alex van Andel
2021-06-24 14:46:35 +01:00
ea5692c20c
Add bookings page
Bailey Pumfleet
2021-06-24 14:36:31 +01:00
a1ddb873f0
minor change to reschedule info in email
Peer Richelsen
2021-06-23 23:45:07 +01:00
5334c350e2
The page was being rendered during the async router.replace call (#306 )
Alex van Andel
2021-06-24 14:46:35 +01:00
ebb3e87284
Add bookings page
Bailey Pumfleet
2021-06-24 14:36:31 +01:00
20cd3bc52e
minor change to reschedule info in email
Peer Richelsen
2021-06-23 23:45:07 +01:00
173d4cda77
dep: nodemailer types
femyeda
2021-06-23 16:16:41 -05:00
2ccbd61a31
dep: handlebars
femyeda
2021-06-23 16:11:38 -05:00
2f7e303bcf
Revert "dep: superjson, plays nice with prisma dates" (#305 )
Femi Odugbesan
2021-06-23 14:15:52 -05:00
b12198e3a6
Merge pull request #303 from emrysal/bugfix/prevent-uppercase-usernames-going-forward
Bailey Pumfleet
2021-06-23 17:18:33 +01:00
c036e757d2
Merge pull request #302 from femyeda/superjson
Bailey Pumfleet
2021-06-23 17:15:49 +01:00
1668785678
Prevent users from entering mixed case usernames
Alex van Andel
2021-06-23 15:49:10 +00:00
7a8222a5ca
dep: superjson
femyeda
2021-06-22 17:44:56 -05:00
mihaic195