Commit Graph

7266 Commits (4ae1c2aa8ca97cc22a23bcf73c8c422f873379a0)

Author SHA1 Message Date
Peer Richelsen a15d05be86 tried fixing the layout of new CalDav integration 2021-08-15 13:10:01 +02:00
Peer_Rich 3fbba351ab
Merge pull request #441 from alishaz-polymath/main
added image-uploader component and refactored profile settings page
2021-08-15 12:50:34 +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 9a8ee10555 Added custom migration to prevent data loss 2021-08-14 18:12:22 +00: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
Peer Richelsen 21c709ee46 fixed booking layout for tablet 2021-08-14 14:26:33 +02:00
Peer Richelsen ea4ac26992 Merge branch 'main' of github.com:calendso/calendso 2021-08-14 14:20:07 +02:00
Peer Richelsen 8e2e798572 wip 2021-08-14 14:19:57 +02:00
Kanji Keraliya 4c48410e2d Fixed: Office 365 integration redirection url issue 2021-08-14 11:55:43 +05:30
Syed Ali Shahbaz 6b7fbe9ecf removed debug remnants 2021-08-14 09:20:11 +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
femyeda 917431f4e8 db: add slug to team schema 2021-08-13 14:44:55 -05:00
femyeda b46cf39ef2 use classnames, remove css 2021-08-13 13:18:14 -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 7ff55b29e0 minor changes to availability headline in booking page 2021-08-12 19:10:57 +02: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 d682804c5f wip 2021-08-12 16:35:08 +02:00
Peer Richelsen 1dc6ae1d26 added border to date picker days on mobile 2021-08-12 16:29:48 +02:00
Peer Richelsen 7b2b75c25c wip 2021-08-12 15:55:09 +02:00
Peer Richelsen c322690cf5 applied new styles to available times 2021-08-12 15:54:05 +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
Bailey Pumfleet b5cd38b77a
Merge pull request #437 from emrysal/bugfix/fixes-saving-event-type
Resolved errors on the pages/event-types/[type].tsx page
2021-08-11 21:59:42 +01:00
Alex van Andel abdfd1d412 Resolved errors on the pages/event-types/[type].tsx page 2021-08-10 22:25:26 +00:00
Bailey Pumfleet 2a45f3c2c0
Merge pull request #433 from emrysal/bugfix/select-calendar-dismisses-when-switch-toggled
Fixed dismiss on toggle + implemented switch component
2021-08-10 12:27:32 +01: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
Bailey Pumfleet 74b629363f Add missing API routes 2021-08-10 08:03:22 +01: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 fa5d63a027
Merge pull request #375 from Nico-J/bugfix/unify-email-sending
Got rid of doubled emails, introduced the EventManager, made several bugfixes, linting + code style improvements
2021-08-08 22:35:22 +01:00
Bailey Pumfleet 35fc5964eb
Merge branch 'main' into bugfix/unify-email-sending 2021-08-08 22:21:53 +01:00
Peer_Rich 3370e24c3b
Merge pull request #414 from alishaz-polymath/main
Changed styling and added dark mode as request in PR 411
2021-08-08 23:20:24 +02: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
Bailey Pumfleet 0bcb00449a
Merge pull request #424 from Nico-J/bugfix/change-zoom-app-type
Change Zoom app type / even fewer scopes needed
2021-08-08 22:15:29 +01: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