Commit Graph

601 Commits (43563bc8d59181ec2b93b5fc29ff601f3b0b14f6)

Author SHA1 Message Date
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