Commit graph

511 commits

Author SHA1 Message Date
Bailey Pumfleet
77ada9667a
Merge pull request #430 from mihaic195/fix/next-auth-issues
Fix next-auth issues
2021-08-17 09:52:11 +01:00
Bailey Pumfleet
c9ea8fd624
Merge pull request #445 from mihaic195/fix/feedback-on-event-type-update
fix: add success modal on event-type update
2021-08-17 09:41:19 +01:00
Peer_Rich
52ca44a3a2
Merge pull request #464 from emrysal/hotfix/inclusive-exclusive-should-be-other-way 2021-08-17 06:12:00 +02:00
Alex van Andel
3a00ab0d0e Switched exclusivity, initial bugfix was incorrect 2021-08-16 22:51:52 +00:00
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