mythic-insight/calcom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5
1188 commits 1 branch 0 tags 57 MiB
Commit graph

707 commits

Author SHA1 Message Date
Peer Richelsen
bf598a21d4 dark mode for add to calendar buttons 2021-08-16 23:10:06 +02:00
femyeda
49e7cbf803 fix issue where user could not connect to caldav 
Uses base caldav adapter to ensure connectivity

rethrows all errors on CalDavCalendarAdapter
 2021-08-16 09:34:49 -05:00
Peer_Rich
dcb619af1f
Merge pull request #434 from joshsny/bugfix/cancel 
Fix 500 error when trying to cancel a booking that was already cancelled.
 2021-08-16 13:31:13 +02:00
Bailey Pumfleet
06dce130b2
Merge pull request #450 from emrysal/bugfix/custom-inputs 2021-08-16 10:35:28 +01:00
Bailey Pumfleet
ceacf02383
Merge pull request #449 from kanji-keraliya/office-365-integration-domain 
Fixed: Office 365 integration redirection URL issue
 2021-08-16 10:23:45 +01:00
Bailey Pumfleet
3d725a9573
Merge pull request #412 from emrysal/bugfix/eventType-merge-artifacts 
Removed selectedEventType + fixed missing booking.eventTypeId
 2021-08-16 10:22:38 +01:00
Peer_Rich
83bef7d95e
Merge pull request #448 from femyeda/team-pages 
Team pages
 2021-08-15 18:44:42 +02:00
Peer Richelsen
b1c2db91e7 Merge branch 'main' of github.com:calendso/calendso 2021-08-15 18:38:15 +02:00
Peer Richelsen
73bec6287d replaced caldav icon 2021-08-15 18:37:50 +02:00
femyeda
19ef588fa5 fix issue where client side vali 
dation not happening

show error message from server
 2021-08-15 09:22:05 -05:00
femyeda
420839bcf5 fix issue where user cant cancel caldav dialog 2021-08-15 08:49:30 -05:00
Peer Richelsen
a15d05be86 tried fixing the layout of new CalDav integration 2021-08-15 13:10:01 +02:00
Peer_Rich
610ea6c9ef
Merge branch 'main' into main 2021-08-15 12:48:48 +02:00
Femi Odugbesan
65366b7c5b
cal-101-caldav-integration (#419) 
* add generic calendar icon for caldav

* module for symmetric encrypt/decrypt

* caldav integration

* use Radix dialog

* Move caldav components to /caldav

* remove duplicate cancel button, unused function

* ensure app can connect to caldav server before adding

* fix calendar clients can possibly return null

* fix: add caldav dialog does not close when submitted

* safely attempt all caldav operations

* clarify variable name, fix typo

* use common helper for stripping html

* remove usage of request lib until "completed"

* add types and usage comments to crypto lib

* add encryption key to example env file
 2021-08-14 20:53:59 -05:00
Alex van Andel
252a329f09 Fixed issues relating to custom-inputs 
* Don't duplicate custom input when editing before db persist
* Remove correct custom input during delete pre db persist (id undefined)
* Moved typings to prisma, keeping backwards compatibility with @map
* Updated all usages of the enum
 2021-08-14 17:03:50 +00:00
Alex van Andel
3a5e7dd61c Delete old redundant page 2021-08-14 16:43:34 +00:00
Alex van Andel
03cfd4ba8b Detect conflicts when the time is the same as startTime 2021-08-14 15:01:05 +00:00
Alex van Andel
92d3f08f70 Merge branch 'main' into bugfix/eventType-merge-artifacts 2021-08-14 14:56:34 +00:00
Kanji Keraliya
4c48410e2d Fixed: Office 365 integration redirection url issue 2021-08-14 11:55:43 +05:30
femyeda
216a7c0c48 prevent duplicate team names 2021-08-13 14:50:11 -05:00
femyeda
60a4b8b29e add page for teams 2021-08-13 14:46:42 -05:00
mihaic195
5193b723a4
fix: add success modal on event-type update 2021-08-13 12:48:20 +03:00
Bailey Pumfleet
da98a1ff1d
Merge pull request #413 from emrysal/bugfix/fix-zoom-calendar-conflict 2021-08-13 09:08:04 +01:00
Peer Richelsen
99e003153e moved og:image outside of isReady scope so it renders on the server 2021-08-12 19:05:46 +02:00
Peer Richelsen
7b2b75c25c wip 2021-08-12 15:55:09 +02:00
Peer Richelsen
655b2b18e8 another booking page design revision 2021-08-12 15:51:40 +02:00
Syed Ali Shahbaz
867e582342 code improvement and accept image only for image uploader input 2021-08-12 16:08:01 +05:30
joshsny
bcb2835648 fixed bug when eventType does not exist for booking 2021-08-12 12:23:10 +02:00
Joshua Snyder
6415b561b7
Update pages/availability/troubleshoot.tsx 
Co-authored-by: Nico <spam@nicolasjessen.de>
 2021-08-12 06:54:01 +02:00
Syed Ali Shahbaz
0c3ec98062 added image-uploader component and refactored profile settings page 2021-08-12 10:14:11 +05:30
Alex van Andel
abdfd1d412 Resolved errors on the pages/event-types/[type].tsx page 2021-08-10 22:25:26 +00:00
joshsny
03407a3738 removed empty array from useEffect 2021-08-10 11:00:05 +02:00
joshsny
747d8f56d3 fix cancelled bookings error 2021-08-10 10:46:02 +02:00
Alex van Andel
4759aed51d Fixed dismiss on toggle + implemented switch component 2021-08-09 22:43:57 +00:00
Peer Richelsen
5d5a90d4f8 Merge branch 'main' of github.com:calendso/calendso 2021-08-09 12:35:28 +02:00
mihaic195
aa8f11d72c
fix: fix next-auth issues 2021-08-09 13:35:06 +03:00
joshsny
7874e17b1c fixed bugs on availability 2021-08-09 11:24:39 +02:00
Peer Richelsen
6e7893d1a8 fixed add guest input for darkmode 2021-08-08 23:44:11 +02:00
Bailey Pumfleet
35fc5964eb
Merge branch 'main' into bugfix/unify-email-sending 2021-08-08 22:21:53 +01:00
Peer_Rich
f664afb371
Merge branch 'main' into main 2021-08-08 23:19:31 +02:00
Peer_Rich
42865dba36
Merge pull request #423 from philippdormann/main 
fix: add missing mailto: in pages/integrations
 2021-08-08 23:16:09 +02:00
Peer Richelsen
c83152abe8 Merge branch 'main' of github.com:calendso/calendso 2021-08-08 22:31:24 +02:00
Peer Richelsen
3bfee8a7bf replaced Loading... with Loader component 2021-08-08 22:31:08 +02:00
nicolas
5a5e61739b Removed faulty check 2021-08-08 21:41:02 +02:00
nicolas
560bd19472 Merge branch 'main' into bugfix/unify-email-sending 2021-08-08 21:21:33 +02:00
Alex van Andel
9cbfd2cda9 Was able to remove one level + improve bottom padding 2021-08-08 16:51:00 +00:00
Peer Richelsen
ded399e8f6 removed unused import 2021-08-08 18:17:17 +02:00
Peer Richelsen
d32d8ea4c3 more minor styling changes to booking 2021-08-08 17:46:21 +02:00
Peer Richelsen
b263970b4f padding to powered by and svg fixes 2021-08-08 17:13:31 +02:00
Peer Richelsen
d562e83c9e route into event types after deleting an event type 2021-08-07 23:06:13 +02:00
Peer Richelsen
418649fc02 removed unused imports 2021-08-07 23:02:04 +02:00
Peer Richelsen
e2d88f1a55 Merge branch 'main' of github.com:calendso/calendso 2021-08-07 22:51:25 +02:00
Peer Richelsen
c9cb36d24e added ToolTip component and added to EventTypes 2021-08-07 14:02:01 +02:00
Philipp Dormann
f391ad4d2a
fix: add missing mailto: in pages/integrations 2021-08-07 01:08:55 +02:00
Bailey Pumfleet
d4fdce5a96 Success page dark mode fixes 2021-08-06 23:45:44 +01:00
Bailey Pumfleet
d5c77c42a3 Partial implementation of the confirmation page redesign 2021-08-06 23:14:35 +01:00
Bailey Pumfleet
f3a780188f Redesign date & time selection page 2021-08-06 16:29:09 +01:00
Peer Richelsen
bf935130ab eslint session comment 2021-08-06 15:09:44 +02:00
Peer Richelsen
2b19a28f89 removed unused imports and function in integrations 2021-08-06 14:32:08 +02:00
joshsny
a764b960b2 changed preview link to open in new tab 2021-08-06 07:30:17 +02:00
Peer Richelsen
3fd3e9ad83 truncate event type description on mobile 2021-08-05 21:14:58 +02:00
Peer Richelsen
9b9db3565a hide preview and copy link button on mobile 2021-08-05 21:03:33 +02:00
Peer Richelsen
6fd7eee070 Merge branch 'main' of github.com:calendso/calendso 2021-08-05 20:49:15 +02:00
Peer Richelsen
68b0c4b8b0 removed unused imports 2021-08-05 20:49:05 +02:00
Femi Odugbesan
18eb32a576
fix issue where rescheduleUid missing when updating date (#418) 2021-08-05 12:35:08 -05:00
Peer_Rich
eb1572fc37
Merge branch 'main' into renaming-integrations 2021-08-05 17:23:53 +02:00
Bailey Pumfleet
0229c8a2fb Dark mode fixes for user page 2021-08-05 15:00:15 +01:00
Bailey Pumfleet
20954259be Merge branch 'main' of https://github.com/calendso/calendso 2021-08-05 13:44:42 +01:00
Bailey Pumfleet
d7f39e9ed6 Redesign profile screen 2021-08-05 13:41:20 +01:00
Peer Richelsen
6ca094f4b2 added launch your own app panel to app store 2021-08-05 14:13:34 +02:00
Peer Richelsen
a92ee0f149 renamed integrations to apps 2021-08-05 14:02:59 +02:00
Peer Richelsen
7ef29453bf minor changes to integrations type eslint 2021-08-05 13:36:24 +02:00
Peer Richelsen
2a18516d19 first half of revisions 2021-08-05 12:02:06 +02:00
Syed Ali Shahbaz
81a3f7f3fc cleaned up code 2021-08-05 10:31:32 +05:30
Syed Ali Shahbaz
6102feec1f improved styling and dark mode for add-guest button 2021-08-05 10:03:08 +05:30
Alex van Andel
8bc209f6d0 Attempts to fix conflict with zoom 2021-08-04 21:04:23 +00:00
Alex van Andel
72b62cd49a Removed selectedEventType + fixed missing booking.eventTypeId 2021-08-04 20:03:20 +00:00
Peer_Rich
6977b74f35
Merge pull request #411 from alishaz-polymath/main 
Added 'Add Guest' button at the confirm booking step
 2021-08-04 20:17:30 +02:00
Bailey Pumfleet
721b874bed Re-add auto slug population 2021-08-04 17:06:05 +01:00
Bailey Pumfleet
a1720a05b4
Merge pull request #409 from emrysal/feature/radix-ui-dialog 
Implemented @radix-ui/dialog for creating new event types
 2021-08-04 16:47:31 +01:00
Bailey Pumfleet
206c4837ed
Merge pull request #406 from emrysal/bugfix/fixes-for-implementing-calendarView 
Missing dayjs().isBetween plugin + format Z explicitly
 2021-08-04 16:45:57 +01:00
Syed Ali Shahbaz
183386848a cleaning up code 2021-08-04 16:20:38 +05:30
Syed Ali Shahbaz
8e277ef800 fixed merge conflict in globals.css 2021-08-04 16:16:53 +05:30
Syed Ali Shahbaz
00069fa9a7 Added -Add guest- button at confirm booking step, and minor code improvement 2021-08-04 16:09:43 +05:30
Alex van Andel
97d727c620 Minor style improvements + fixed nested button, DialogTrigger is a button 2021-08-03 23:28:12 +00:00
Alex van Andel
4225016829 Changed the mechanism by which we center the dialog 2021-08-03 22:17:12 +00:00
Alex van Andel
c3f5abe68f Fixes no-document-viewport-meta + adds lang='en' to <html> tag, little global fixes 2021-08-03 18:15:24 +00:00
Alex van Andel
972a8dcb76 Merged with main 2021-08-03 17:52:10 +00:00
Alex van Andel
c02eaf2486 Implemented @radix-ui/dialog for creating new event types 2021-08-03 17:36:55 +00:00
Peer Richelsen
60d8b05422 temporally removed backdrop for event type dialog until @emrysal implements radix 2021-08-03 13:43:00 +02:00
Peer Richelsen
60242d3237 trying to figure out why event types modal is not working correctly on mobile safari 2021-08-03 13:34:46 +02:00
Peer Richelsen
57b4e25647 changed zIndex of modal backfrop to 0 2021-08-03 13:23:19 +02:00
Peer Richelsen
ae836321c9 changed zIndex of modal backfrop to 10 2021-08-03 13:21:21 +02:00
Peer Richelsen
39ee723dc5 moved zIndex for modal to 50 from 10 2021-08-03 13:19:32 +02:00
Peer Richelsen
49777eb05b full width event types list on mobile 2021-08-03 13:16:25 +02:00
Malte Delfs
a99e709caa
Merge pull request #407 from Malte-D/bugfix/bool-input 
fixed boolean custom input bug #398
 2021-08-03 12:49:05 +02:00
Malte Delfs
ea22741153 fixed #398 2021-08-03 12:45:19 +02:00
Peer Richelsen
b9125a54c8 ignore unused response ESLint error 2021-08-03 12:29:51 +02:00
Alex van Andel
78de56b7f5 Missing dayjs().isBetween plugin + format Z explicitly 2021-08-03 10:14:20 +00:00
Peer Richelsen
5b48b26111 fixed layout for event type detail view on mobile 2021-08-03 12:01:12 +02:00
Peer Richelsen
062d9a9935 added new favicon 2021-08-03 11:39:06 +02:00
Peer Richelsen
90aed4a2b9 removed zoom (caused some issues with dialogs) and removed lorem ipsum (whoopsie) 2021-08-03 11:32:37 +02:00
Peer Richelsen
927d7a4bb0 /booking truncate event name for mobile 2021-08-03 11:09:21 +02:00
Peer Richelsen
2d36b5d229 /booking truncate event name for mobile 2021-08-03 11:09:15 +02:00
Peer Richelsen
a4c1ac8275 added icons to buttons, added mailto to /booking, moved date into one column 2021-08-03 10:47:01 +02:00
Peer Richelsen
a151dcfd01 removed unused imports 2021-08-03 10:34:43 +02:00
Peer Richelsen
8340fce157 extracted classNames into helpers 2021-08-03 10:30:35 +02:00
Peer Richelsen
0bc0119362 Merge branch 'main' of github.com:calendso/calendso 2021-08-03 10:12:17 +02:00
Peer Richelsen
3119c35749 removed unused code 2021-08-03 10:07:39 +02:00
Bailey Pumfleet
fd535fc308
Merge pull request #379 from mihaic195/fix/settings-page-and-theme-on-booking-page 
Fix: Settings page bug and dark theme adjustments
 2021-08-03 08:27:29 +01:00
Bailey Pumfleet
de5571c8b6
Merge pull request #380 from peduarte/feature/make-collapsible-time-options-accessible 
Make collapsible time options accessible to screen readers
 2021-08-03 08:25:31 +01:00
Bailey Pumfleet
874b33ab04
Merge pull request #403 from emrysal/feature/create-first-eventtype-mobile-first 
Improved 'Create your first event type' layouting
 2021-08-03 08:11:32 +01:00
Bailey Pumfleet
59a1346325
Merge branch 'main' into main 2021-08-03 08:05:03 +01:00
Syed Ali Shahbaz
4becb21d53 Cleaned up the code 2021-08-03 05:59:38 +05:30
Syed Ali Shahbaz
5388ea0610 Added date and time to booking entries 2021-08-03 05:52:17 +05:30
Alex van Andel
81bcd021df Improved 'Create your first event type' layouting 2021-08-02 22:11:36 +00:00
Peer Richelsen
e5550b72ba added <Loader> component 2021-08-02 22:57:58 +02:00
nicolas
40938bdf6a Merged main into current branch; lots of linting 2021-08-02 22:51:57 +02:00
Peer Richelsen
71fc0ba437 trying a different redirect for home to event-types 2021-08-02 20:04:06 +02:00
Peer Richelsen
9051a0d60e added loader for / redirect to eventTypes 2021-08-02 19:57:35 +02:00
Peer Richelsen
f48e604db3 removed dashboard, redirecting to eventTypes as new default page 2021-08-02 19:37:25 +02:00
Peer Richelsen
0568e7250c fixed mobile tabs in settings 2021-08-02 19:29:34 +02:00
Peer Richelsen
6ae1be6912 minor change on profile 2021-08-02 19:22:35 +02:00
Peer Richelsen
f71c5d2075 fixed integrations button absolute positioning 2021-08-02 19:16:20 +02:00
Peer Richelsen
a35ac3487b fixed layout for bookings on mobile 2021-08-02 18:54:27 +02:00
Peer Richelsen
b11cace4fa fixed integration CTA 2021-08-02 18:40:39 +02:00
Peer Richelsen
d549c0321d fixed integration CTA 2021-08-02 18:38:26 +02:00
Peer Richelsen
0eb7cea1e1 fixed integration CTA 2021-08-02 18:38:02 +02:00
Peer Richelsen
d08b4ba0f3 changed colors of password reset 2021-08-02 18:32:45 +02:00
Peer Richelsen
aaa86888db added create account link for hosted 2021-08-02 18:31:49 +02:00
Peer Richelsen
60b9f7ee15 replaced logo at login 2021-08-02 18:30:30 +02:00
Peer Richelsen
4c2b8f5b6f styled teams section 2021-08-02 17:36:28 +02:00
Peer Richelsen
bd7443017a fixed layout for react-select 2021-08-02 17:24:01 +02:00
Peer Richelsen
64961cada1 added bottom nav, replaced png with svg integration icons, added subtitle to shell component 2021-08-02 16:10:24 +02:00
Syed Ali Shahbaz
e734b5f5de Entering Title autogenerates Slug 2021-08-02 12:42:46 +05:30
nicolas
c8a53d7f29 Merge branch 'main' into bugfix/unify-email-sending 2021-08-01 22:59:43 +02:00
Bailey Pumfleet
a608f94590 Initial restyling 2021-07-31 00:05:38 +01:00
Peer Richelsen
062b92be29 fixed overflow bug on long booking items 2021-07-30 11:53:21 +02:00
nicolas
bd28636af5 Merge branch 'main' into bugfix/unify-email-sending 2021-07-28 22:01:58 +02:00
Alex van Andel
18c96afc2b Double fix for o365/outlook buttons 2021-07-28 12:28:36 +00:00
Bailey Pumfleet
f6edd06f85
Merge pull request #389 from emrysal/bugfix/office365-weird-behaviour-non-utc 
Updated office365 button to UTC
 2021-07-28 08:57:47 +01:00
Alex van Andel
ad8cc4e985 Updated office365 button to UTC 2021-07-27 23:17:07 +00:00
Peer Richelsen
d3569978f5 added dark mode classes for custom input fields 2021-07-26 22:08:53 +02:00
nicolas
65fd733751 Use optional udi 2021-07-25 17:08:11 +02:00
nicolas
4fb8e8285e Added location to event 2021-07-25 16:29:06 +02:00
nicolas
df161d5498 Added location to bookings table 2021-07-25 14:37:22 +02:00
nicolas
a97862d4b8 Process event location in EventManager 2021-07-25 14:19:49 +02:00
nicolas
86e2add30f Resolved conflicts; included reference creation into EventManager; use EventManager everywhere 2021-07-24 22:24:00 +02:00
Alex van Andel
9234f74bec Added accompanying frontend 2021-07-23 20:19:23 +00:00
Alex van Andel
4368ad0289 Implement minimum booking notice 2021-07-22 22:52:27 +00:00
Pedro Duarte
c745416a6a Make collapsible time options accessible to screen readers 2021-07-22 14:16:54 +02:00
mihaic195
394be8612b
fix: settings page was missing value prop and restyled dark theme elements on booking page 2021-07-22 15:16:21 +03:00
Bailey Pumfleet
e6790281b6 Fix embed URLs to use BASE_URL 2021-07-22 12:04:15 +01:00
Bailey Pumfleet
02dd0eb8e2
Merge pull request #371 from Malte-D/feature/opt-in-booking 
Feature/opt in booking
 2021-07-22 11:30:48 +01:00
nicolas
e0abbbb2f1 Fixed linting errors 2021-07-20 20:18:26 +02:00
nicolas
7aff32fb50 Only send single mail when booking zoom 2021-07-20 20:07:59 +02:00
Alex van Andel
7098e75841 Fixes 404 issue with slug when trailing whitespaces exist 2021-07-20 13:27:36 +00:00
Bailey Pumfleet
9375f337d7 Fix Codacy issues 2021-07-19 16:56:58 +01:00
nicolas
a40a5c04fe Retain rescheduleUid when picking a date 2021-07-18 22:17:18 +02:00
Malte Delfs
0c975cdcbc fixed codacy issues 2021-07-18 21:22:39 +02:00
Malte Delfs
f5516ed427 added reminder emails for opt-in bookings 2021-07-18 21:12:35 +02:00
Malte Delfs
a2bf242c9e opt in booking 2021-07-18 20:28:54 +02:00
nicolas
81e1287693 Fixed cancellation 2021-07-18 16:03:59 +02:00
nicolas
270e6b2d4f Merge branch 'main' into bugfix/unify-email-sending 2021-07-18 15:12:57 +02:00
nicolas
b4ed8ae87e Merge branch 'main' into bugfix/unify-email-sending 2021-07-18 15:12:18 +02:00
Bailey Pumfleet
87f9f83643 Fix broken event types card on dashboard 2021-07-17 11:39:28 +01:00
nicolas
b146b80778 Fixed signature 2021-07-15 23:34:55 +02:00
Femi Odugbesan
b27ba5123c
fix: stats, layout defect from merge (#367) 2021-07-15 09:48:02 -05:00
Femi Odugbesan
45689059c7
Feat/cal 95/date range on event types (#353) 
* add edit links to events on dashboard

* fit elements on screen for mobile

* initialize components for consistent text styles

* add more fine grained width/height settings

* add higher level setting for when an event is available

- db: add supporting values to period allow setting an amount of days,
 a range, or unlimited number days an event is available

* fix issue where periodDates are null

* return minimal required data, handle date parsing

* [ui] limit booking days based on user period settings

* api: validate user period settings

* [db] migration for event type period settings
 2021-07-15 09:10:26 -05:00
nicolas
daecc1e0e4 Created EventManager in order to unify event CRUD logic 2021-07-15 03:19:30 +02:00
Egor Zaitsev
1dadf9f9a6 fix: same problem on the availability page 2021-07-14 14:19:55 +03:00
Egor Zaitsev
cb3c23e9b0 fix: truncate event type description instead of title 2021-07-14 12:58:08 +03:00
Femi Odugbesan
793351fe96
[cal-184] add and handle date query params for event types (#359) 2021-07-13 11:10:22 -05:00
Bailey Pumfleet
6ed9bfde7b
Merge pull request #354 from emrysal/feature/user-theme 
Implemented theme through user preferences
 2021-07-12 14:01:08 +01:00
Alex van Andel
4d7427ad91 Fixes some linting + codacy issues 2021-07-11 19:43:28 +00:00
Malte Delfs
3283eb422c Fixed a bug that selected the following day on the booking page, when the selected time is smaller than the utc offset of the current timezone. Also fixed the reloading of the last 24h/12h selection 2021-07-11 18:05:49 +02:00
Alex van Andel
5206fb4f88 Implemented theme through user preferences 2021-07-09 23:13:34 +00:00
Femi Odugbesan
36b258f4b7
safely check user availability (#352) 2021-07-09 10:55:02 -05:00
Femi Odugbesan
5c4a9c32d1
Add application logger (#332) 
* add application logger

* use logger
 2021-07-09 10:49:42 -05:00
Bailey Pumfleet
a9b45c1057
Merge pull request #351 from calendso/darkmode 
hotfix: added dark mode for profile page
 2021-07-09 14:14:53 +01:00
Peer Richelsen
bf85cff76d added dark mode for profile page 2021-07-09 13:34:00 +02:00
Bailey Pumfleet
c02c69073d
Merge pull request #346 from calendso/darkmode 
added darkmode classes to [type] and /book and dashboard
 2021-07-09 11:46:16 +01:00
Alex van Andel
be102b1b09 Fixes #347 & some other minor things when timezones differ 2021-07-08 21:14:29 +00:00
Alex van Andel
ffd99d02bb Implement whereAndSelect decorator 2021-07-08 20:44:40 +00:00
Bailey Pumfleet
db7c467d73 Merge branch 'main' of https://github.com/calendso/calendso into main 2021-07-08 10:23:48 +01:00
Bailey Pumfleet
5c699f8471 Add troubleshoot page & add loading spinners 2021-07-08 10:23:22 +01:00
Peer Richelsen
01fc00b92f added darkmode classs to ¢[type] and /book 2021-07-07 21:58:18 +02:00
Femi Odugbesan
2f73997e72
safely check isAvailable (#331) 
fix issue where checking availability throws an error
 2021-07-07 11:53:33 -05:00
nicolas
3c09837104 Resolved conflicts 2021-07-07 12:43:13 +02:00
Bailey Pumfleet
ad00e5fc0c
Merge pull request #333 from mihaic195/fix/teams-create-error-and-unauthenticated-request 
Team API error and page
 2021-07-07 10:56:16 +01:00
Bailey Pumfleet
43f899582f Fix issue where user ID is not fetched 2021-07-06 22:09:53 +01:00
mihaic195
e315b272f5
Merge branch 'main' into fix/teams-create-error-and-unauthenticated-request 2021-07-05 10:18:28 +03:00
Peer Richelsen
749978798b fixed layout for confirmation screen on mobile 2021-07-03 22:27:56 +02:00
Peer Richelsen
b61cdbf40c removed top margin and shadow for mobile layout 2021-07-03 22:19:12 +02:00
Alex van Andel
b136941948 Fixes #337: Event times ordered seemingly random 2021-07-03 14:24:30 +00: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
d701d3905d
Merge pull request #293 from emrysal/feature/scheduling 
Feature/scheduling
 2021-07-01 13:52:08 +01: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
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
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
Alex van Andel
5d30586a24 Heavily simplified the startTime and endTime display by removing dayjs from SetTimesModal 2021-06-29 22:00:25 +00: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
099186fdd9
Merge branch 'main' into bugfix/zoom-invalid-token 2021-06-29 16:19:20 +01: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
mihaic195
39df7d61bc
fix: add login link on forgot password page 2021-06-29 11:45:54 +03:00
Alex van Andel
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. 2021-06-29 01:45:58 +00:00
femyeda
d1bdac45eb dont allow user to book a past date 2021-06-28 19:39:08 -05:00
nicolas
f918f220eb Fixed Zoom Auth 2021-06-29 02:21:08 +02:00
Alex van Andel
b4272ad7aa Merge branch 'main' of github.com:calendso/calendso into feature/scheduling 2021-06-28 19:53:07 +00:00
Alex van Andel
1eba242820 Compare busyTimes in UTC, re-implement hasErrors 2021-06-27 22:30:11 +00:00
Alex van Andel
7030851efb Merged with main, fixed issue that caused multiple AvailableTimes refreshes. 2021-06-27 21:34:38 +00:00
Alex van Andel
383ec64a7f onChange callback got removed in eslint cleanups 
Triggered eslint:no-empty-function, this PR circumvents this by adding
a comment as part of the function body.
 2021-06-27 13:51:06 +00:00
Malte Delfs
b5b480f7e2 hotfix for booking 2021-06-26 19:48:24 +02:00
Bailey Pumfleet
aa2e35d68e
Merge pull request #311 from Nico-J/feature/zoom-event-location 
Added zoom as an event location and fixed linting
 2021-06-25 16:52:52 +01:00
Bailey Pumfleet
8394b12a71
Merge pull request #307 from femyeda/feat/cal-69/password-reset 
Feat/cal 69/password reset
 2021-06-25 16:52:36 +01:00
Bailey Pumfleet
cc02558ac6
Merge pull request #310 from femyeda/fix-244-can-book-when-not-available 
Fix 244 can book when not available
 2021-06-25 16:51:28 +01:00
femyeda
e883ab591a simplify expiry calculation, timezone unneccessary 2021-06-25 09:23:32 -05:00
femyeda
6fec24a69d use lib folder 2021-06-25 09:21:21 -05:00
femyeda
ad657c0261 use proper response code 2021-06-25 09:17:39 -05:00
femyeda
2c29368337 fix: passwordResetLink uses correct page 2021-06-25 09:16:24 -05:00
Alex van Andel
28edb86c14 Don't render location if there is none for now 2021-06-24 22:48:01 +00:00
nicolas
bc47975316 Added zoom as an event location and fixed ESLint 2021-06-25 00:26:55 +02:00
Alex van Andel
ef3274d8f3 Working version ready for testing 
* More tests to be added to verify slots logic
* Adds Jest
* Implements logic to the booking code to take into account grayed days
* Slots take workhours into account

TODO: Improve the tests, evaluate the structure, small re-orgs here and
there for improved readability / better code
 2021-06-24 22:15:18 +00:00
femyeda
a53cdf2660 fix: issue where user could book a meeting when unavailable 2021-06-24 16:21:25 -05:00
Malte Delfs
9c3eea5257 booking hotfix 2021-06-24 20:41:26 +02:00
Malte Delfs
646ff4a107 eslint fixes 2021-06-24 18:12:22 +02:00
Malte Delfs
917b2c4821 Merge branch 'main' into feature/refresh-tokens-and-error-handling 2021-06-24 18:03:54 +02:00
femyeda
ab1298e2ca Allow user to reset password 2021-06-24 11:01:41 -05:00
Bailey Pumfleet
ea5692c20c Add bookings page 2021-06-24 11:01:41 -05:00
Bailey Pumfleet
ebb3e87284 Add bookings page 2021-06-24 14:36:31 +01:00