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
3a5e7dd61c
Delete old redundant page
2021-08-14 16:43:34 +00:00
03cfd4ba8b
Detect conflicts when the time is the same as startTime
2021-08-14 15:01:05 +00:00
92d3f08f70
Merge branch 'main' into bugfix/eventType-merge-artifacts
2021-08-14 14:56:34 +00:00
4c48410e2d
Fixed: Office 365 integration redirection url issue
2021-08-14 11:55:43 +05:30
216a7c0c48
prevent duplicate team names
2021-08-13 14:50:11 -05:00
60a4b8b29e
add page for teams
2021-08-13 14:46:42 -05:00
5193b723a4
fix: add success modal on event-type update
2021-08-13 12:48:20 +03:00
da98a1ff1d
Merge pull request #413 from emrysal/bugfix/fix-zoom-calendar-conflict
2021-08-13 09:08:04 +01:00
99e003153e
moved og:image outside of isReady scope so it renders on the server
2021-08-12 19:05:46 +02:00
7b2b75c25c
wip
2021-08-12 15:55:09 +02:00
655b2b18e8
another booking page design revision
2021-08-12 15:51:40 +02:00
867e582342
code improvement and accept image only for image uploader input
2021-08-12 16:08:01 +05:30
bcb2835648
fixed bug when eventType does not exist for booking
2021-08-12 12:23:10 +02:00
6415b561b7
Update pages/availability/troubleshoot.tsx
...
Co-authored-by: Nico <spam@nicolasjessen.de>
2021-08-12 06:54:01 +02:00
0c3ec98062
added image-uploader component and refactored profile settings page
2021-08-12 10:14:11 +05:30
abdfd1d412
Resolved errors on the pages/event-types/[type].tsx page
2021-08-10 22:25:26 +00:00
03407a3738
removed empty array from useEffect
2021-08-10 11:00:05 +02:00
747d8f56d3
fix cancelled bookings error
2021-08-10 10:46:02 +02:00
4759aed51d
Fixed dismiss on toggle + implemented switch component
2021-08-09 22:43:57 +00:00
5d5a90d4f8
Merge branch 'main' of github.com:calendso/calendso
2021-08-09 12:35:28 +02:00
aa8f11d72c
fix: fix next-auth issues
2021-08-09 13:35:06 +03:00
7874e17b1c
fixed bugs on availability
2021-08-09 11:24:39 +02:00
6e7893d1a8
fixed add guest input for darkmode
2021-08-08 23:44:11 +02:00
35fc5964eb
Merge branch 'main' into bugfix/unify-email-sending
2021-08-08 22:21:53 +01:00
f664afb371
Merge branch 'main' into main
2021-08-08 23:19:31 +02:00
42865dba36
Merge pull request #423 from philippdormann/main
...
fix: add missing mailto: in pages/integrations
2021-08-08 23:16:09 +02:00
c83152abe8
Merge branch 'main' of github.com:calendso/calendso
2021-08-08 22:31:24 +02:00
3bfee8a7bf
replaced Loading... with Loader component
2021-08-08 22:31:08 +02:00
5a5e61739b
Removed faulty check
2021-08-08 21:41:02 +02:00
560bd19472
Merge branch 'main' into bugfix/unify-email-sending
2021-08-08 21:21:33 +02:00
9cbfd2cda9
Was able to remove one level + improve bottom padding
2021-08-08 16:51:00 +00:00
ded399e8f6
removed unused import
2021-08-08 18:17:17 +02:00
d32d8ea4c3
more minor styling changes to booking
2021-08-08 17:46:21 +02:00
b263970b4f
padding to powered by and svg fixes
2021-08-08 17:13:31 +02:00
d562e83c9e
route into event types after deleting an event type
2021-08-07 23:06:13 +02:00
418649fc02
removed unused imports
2021-08-07 23:02:04 +02:00
e2d88f1a55
Merge branch 'main' of github.com:calendso/calendso
2021-08-07 22:51:25 +02:00
c9cb36d24e
added ToolTip component and added to EventTypes
2021-08-07 14:02:01 +02:00
f391ad4d2a
fix: add missing mailto: in pages/integrations
2021-08-07 01:08:55 +02:00
d4fdce5a96
Success page dark mode fixes
2021-08-06 23:45:44 +01:00
d5c77c42a3
Partial implementation of the confirmation page redesign
2021-08-06 23:14:35 +01:00
f3a780188f
Redesign date & time selection page
2021-08-06 16:29:09 +01:00
bf935130ab
eslint session comment
2021-08-06 15:09:44 +02:00
2b19a28f89
removed unused imports and function in integrations
2021-08-06 14:32:08 +02:00
a764b960b2
changed preview link to open in new tab
2021-08-06 07:30:17 +02:00
3fd3e9ad83
truncate event type description on mobile
2021-08-05 21:14:58 +02:00
9b9db3565a
hide preview and copy link button on mobile
2021-08-05 21:03:33 +02:00
6fd7eee070
Merge branch 'main' of github.com:calendso/calendso
2021-08-05 20:49:15 +02:00
68b0c4b8b0
removed unused imports
2021-08-05 20:49:05 +02:00
18eb32a576
fix issue where rescheduleUid missing when updating date ( #418 )
2021-08-05 12:35:08 -05:00
eb1572fc37
Merge branch 'main' into renaming-integrations
2021-08-05 17:23:53 +02:00
0229c8a2fb
Dark mode fixes for user page
2021-08-05 15:00:15 +01:00
20954259be
Merge branch 'main' of https://github.com/calendso/calendso
2021-08-05 13:44:42 +01:00
d7f39e9ed6
Redesign profile screen
2021-08-05 13:41:20 +01:00
6ca094f4b2
added launch your own app panel to app store
2021-08-05 14:13:34 +02:00
a92ee0f149
renamed integrations to apps
2021-08-05 14:02:59 +02:00
7ef29453bf
minor changes to integrations type eslint
2021-08-05 13:36:24 +02:00
2a18516d19
first half of revisions
2021-08-05 12:02:06 +02:00
81a3f7f3fc
cleaned up code
2021-08-05 10:31:32 +05:30
6102feec1f
improved styling and dark mode for add-guest button
2021-08-05 10:03:08 +05:30
8bc209f6d0
Attempts to fix conflict with zoom
2021-08-04 21:04:23 +00:00
72b62cd49a
Removed selectedEventType + fixed missing booking.eventTypeId
2021-08-04 20:03:20 +00:00
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
721b874bed
Re-add auto slug population
2021-08-04 17:06:05 +01:00
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
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
183386848a
cleaning up code
2021-08-04 16:20:38 +05:30
8e277ef800
fixed merge conflict in globals.css
2021-08-04 16:16:53 +05:30
00069fa9a7
Added -Add guest- button at confirm booking step, and minor code improvement
2021-08-04 16:09:43 +05:30
97d727c620
Minor style improvements + fixed nested button, DialogTrigger is a button
2021-08-03 23:28:12 +00:00
4225016829
Changed the mechanism by which we center the dialog
2021-08-03 22:17:12 +00:00
c3f5abe68f
Fixes no-document-viewport-meta + adds lang='en' to <html> tag, little global fixes
2021-08-03 18:15:24 +00:00
972a8dcb76
Merged with main
2021-08-03 17:52:10 +00:00
c02eaf2486
Implemented @radix-ui/dialog for creating new event types
2021-08-03 17:36:55 +00:00
60d8b05422
temporally removed backdrop for event type dialog until @emrysal implements radix
2021-08-03 13:43:00 +02:00
60242d3237
trying to figure out why event types modal is not working correctly on mobile safari
2021-08-03 13:34:46 +02:00
57b4e25647
changed zIndex of modal backfrop to 0
2021-08-03 13:23:19 +02:00
ae836321c9
changed zIndex of modal backfrop to 10
2021-08-03 13:21:21 +02:00
39ee723dc5
moved zIndex for modal to 50 from 10
2021-08-03 13:19:32 +02:00
49777eb05b
full width event types list on mobile
2021-08-03 13:16:25 +02:00
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
ea22741153
fixed #398
2021-08-03 12:45:19 +02:00
b9125a54c8
ignore unused response ESLint error
2021-08-03 12:29:51 +02:00
78de56b7f5
Missing dayjs().isBetween plugin + format Z explicitly
2021-08-03 10:14:20 +00:00
5b48b26111
fixed layout for event type detail view on mobile
2021-08-03 12:01:12 +02:00
062d9a9935
added new favicon
2021-08-03 11:39:06 +02:00
90aed4a2b9
removed zoom (caused some issues with dialogs) and removed lorem ipsum (whoopsie)
2021-08-03 11:32:37 +02:00
927d7a4bb0
/booking truncate event name for mobile
2021-08-03 11:09:21 +02:00
2d36b5d229
/booking truncate event name for mobile
2021-08-03 11:09:15 +02:00
a4c1ac8275
added icons to buttons, added mailto to /booking, moved date into one column
2021-08-03 10:47:01 +02:00
a151dcfd01
removed unused imports
2021-08-03 10:34:43 +02:00
8340fce157
extracted classNames into helpers
2021-08-03 10:30:35 +02:00
0bc0119362
Merge branch 'main' of github.com:calendso/calendso
2021-08-03 10:12:17 +02:00
3119c35749
removed unused code
2021-08-03 10:07:39 +02:00
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
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
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
59a1346325
Merge branch 'main' into main
2021-08-03 08:05:03 +01:00
4becb21d53
Cleaned up the code
2021-08-03 05:59:38 +05:30
5388ea0610
Added date and time to booking entries
2021-08-03 05:52:17 +05:30
81bcd021df
Improved 'Create your first event type' layouting
2021-08-02 22:11:36 +00:00
e5550b72ba
added <Loader> component
2021-08-02 22:57:58 +02:00
40938bdf6a
Merged main into current branch; lots of linting
2021-08-02 22:51:57 +02:00
71fc0ba437
trying a different redirect for home to event-types
2021-08-02 20:04:06 +02:00
9051a0d60e
added loader for / redirect to eventTypes
2021-08-02 19:57:35 +02:00
f48e604db3
removed dashboard, redirecting to eventTypes as new default page
2021-08-02 19:37:25 +02:00
0568e7250c
fixed mobile tabs in settings
2021-08-02 19:29:34 +02:00
6ae1be6912
minor change on profile
2021-08-02 19:22:35 +02:00
f71c5d2075
fixed integrations button absolute positioning
2021-08-02 19:16:20 +02:00
a35ac3487b
fixed layout for bookings on mobile
2021-08-02 18:54:27 +02:00
b11cace4fa
fixed integration CTA
2021-08-02 18:40:39 +02:00
d549c0321d
fixed integration CTA
2021-08-02 18:38:26 +02:00
0eb7cea1e1
fixed integration CTA
2021-08-02 18:38:02 +02:00
d08b4ba0f3
changed colors of password reset
2021-08-02 18:32:45 +02:00
aaa86888db
added create account link for hosted
2021-08-02 18:31:49 +02:00
60b9f7ee15
replaced logo at login
2021-08-02 18:30:30 +02:00
4c2b8f5b6f
styled teams section
2021-08-02 17:36:28 +02:00
bd7443017a
fixed layout for react-select
2021-08-02 17:24:01 +02:00
64961cada1
added bottom nav, replaced png with svg integration icons, added subtitle to shell component
2021-08-02 16:10:24 +02:00
e734b5f5de
Entering Title autogenerates Slug
2021-08-02 12:42:46 +05:30
c8a53d7f29
Merge branch 'main' into bugfix/unify-email-sending
2021-08-01 22:59:43 +02:00
a608f94590
Initial restyling
2021-07-31 00:05:38 +01:00
062b92be29
fixed overflow bug on long booking items
2021-07-30 11:53:21 +02:00
bd28636af5
Merge branch 'main' into bugfix/unify-email-sending
2021-07-28 22:01:58 +02:00
18c96afc2b
Double fix for o365/outlook buttons
2021-07-28 12:28:36 +00:00
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
ad8cc4e985
Updated office365 button to UTC
2021-07-27 23:17:07 +00:00
d3569978f5
added dark mode classes for custom input fields
2021-07-26 22:08:53 +02:00
65fd733751
Use optional udi
2021-07-25 17:08:11 +02:00
4fb8e8285e
Added location to event
2021-07-25 16:29:06 +02:00
df161d5498
Added location to bookings table
2021-07-25 14:37:22 +02:00
a97862d4b8
Process event location in EventManager
2021-07-25 14:19:49 +02:00
86e2add30f
Resolved conflicts; included reference creation into EventManager; use EventManager everywhere
2021-07-24 22:24:00 +02:00
9234f74bec
Added accompanying frontend
2021-07-23 20:19:23 +00:00
4368ad0289
Implement minimum booking notice
2021-07-22 22:52:27 +00:00
c745416a6a
Make collapsible time options accessible to screen readers
2021-07-22 14:16:54 +02:00
394be8612b
fix: settings page was missing value prop and restyled dark theme elements on booking page
2021-07-22 15:16:21 +03:00
e6790281b6
Fix embed URLs to use BASE_URL
2021-07-22 12:04:15 +01:00
02dd0eb8e2
Merge pull request #371 from Malte-D/feature/opt-in-booking
...
Feature/opt in booking
2021-07-22 11:30:48 +01:00
e0abbbb2f1
Fixed linting errors
2021-07-20 20:18:26 +02:00
7aff32fb50
Only send single mail when booking zoom
2021-07-20 20:07:59 +02:00
7098e75841
Fixes 404 issue with slug when trailing whitespaces exist
2021-07-20 13:27:36 +00:00
9375f337d7
Fix Codacy issues
2021-07-19 16:56:58 +01:00
a40a5c04fe
Retain rescheduleUid when picking a date
2021-07-18 22:17:18 +02:00
0c975cdcbc
fixed codacy issues
2021-07-18 21:22:39 +02:00
f5516ed427
added reminder emails for opt-in bookings
2021-07-18 21:12:35 +02:00
a2bf242c9e
opt in booking
2021-07-18 20:28:54 +02:00
81e1287693
Fixed cancellation
2021-07-18 16:03:59 +02:00
270e6b2d4f
Merge branch 'main' into bugfix/unify-email-sending
2021-07-18 15:12:57 +02:00
b4ed8ae87e
Merge branch 'main' into bugfix/unify-email-sending
2021-07-18 15:12:18 +02:00
87f9f83643
Fix broken event types card on dashboard
2021-07-17 11:39:28 +01:00
b146b80778
Fixed signature
2021-07-15 23:34:55 +02:00
b27ba5123c
fix: stats, layout defect from merge ( #367 )
2021-07-15 09:48:02 -05:00
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
daecc1e0e4
Created EventManager in order to unify event CRUD logic
2021-07-15 03:19:30 +02:00
1dadf9f9a6
fix: same problem on the availability page
2021-07-14 14:19:55 +03:00
cb3c23e9b0
fix: truncate event type description instead of title
2021-07-14 12:58:08 +03:00
793351fe96
[cal-184] add and handle date query params for event types ( #359 )
2021-07-13 11:10:22 -05:00
6ed9bfde7b
Merge pull request #354 from emrysal/feature/user-theme
...
Implemented theme through user preferences
2021-07-12 14:01:08 +01:00
4d7427ad91
Fixes some linting + codacy issues
2021-07-11 19:43:28 +00:00
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
5206fb4f88
Implemented theme through user preferences
2021-07-09 23:13:34 +00:00
36b258f4b7
safely check user availability ( #352 )
2021-07-09 10:55:02 -05:00
5c4a9c32d1
Add application logger ( #332 )
...
* add application logger
* use logger
2021-07-09 10:49:42 -05:00
a9b45c1057
Merge pull request #351 from calendso/darkmode
...
hotfix: added dark mode for profile page
2021-07-09 14:14:53 +01:00
bf85cff76d
added dark mode for profile page
2021-07-09 13:34:00 +02:00
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
be102b1b09
Fixes #347 & some other minor things when timezones differ
2021-07-08 21:14:29 +00:00
ffd99d02bb
Implement whereAndSelect decorator
2021-07-08 20:44:40 +00:00
db7c467d73
Merge branch 'main' of https://github.com/calendso/calendso into main
2021-07-08 10:23:48 +01:00
5c699f8471
Add troubleshoot page & add loading spinners
2021-07-08 10:23:22 +01:00
01fc00b92f
added darkmode classs to ¢[type] and /book
2021-07-07 21:58:18 +02:00
2f73997e72
safely check isAvailable ( #331 )
...
fix issue where checking availability throws an error
2021-07-07 11:53:33 -05:00
3c09837104
Resolved conflicts
2021-07-07 12:43:13 +02:00
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
43f899582f
Fix issue where user ID is not fetched
2021-07-06 22:09:53 +01:00
e315b272f5
Merge branch 'main' into fix/teams-create-error-and-unauthenticated-request
2021-07-05 10:18:28 +03:00
749978798b
fixed layout for confirmation screen on mobile
2021-07-03 22:27:56 +02:00
b61cdbf40c
removed top margin and shadow for mobile layout
2021-07-03 22:19:12 +02:00
b136941948
Fixes #337 : Event times ordered seemingly random
2021-07-03 14:24:30 +00:00
dcf2744566
Update pages/_app.tsx
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-02 13:32:45 +03:00
b15ef1d8b0
Update pages/settings/teams.tsx
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-02 13:32:27 +03:00
2af9ed55a7
Update pages/settings/teams.tsx
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-02 13:32:11 +03:00
8500a8dd64
Update pages/settings/teams.tsx
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-02 13:31:59 +03:00
2008ad263c
fix: ssr session on teams page
2021-07-02 13:28:33 +03:00
d701d3905d
Merge pull request #293 from emrysal/feature/scheduling
...
Feature/scheduling
2021-07-01 13:52:08 +01:00
6f64df3e75
lint
2021-07-01 12:51:51 +03:00
6463b3ba37
fix codacy suggestions
2021-07-01 12:47:12 +03:00
715033f4e1
Update pages/settings/teams.tsx
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:31:40 +03:00
9eff620ee0
Update pages/settings/teams.tsx
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:30:51 +03:00
4a1e8cfbf7
Update pages/settings/teams.tsx
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:30:40 +03:00
0fb2984138
Update pages/settings/teams.tsx
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:30:31 +03:00
b71cc82a0e
Update pages/settings/teams.tsx
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:30:20 +03:00
769f36f8d5
Update pages/settings/teams.tsx
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:30:10 +03:00
b91d021fc8
Update pages/api/teams.ts
...
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-07-01 12:29:55 +03:00
1122def2c0
update fetch to also handle errors
2021-07-01 11:47:27 +03:00
6aa8df7fcf
If no availability set, default to user prefs
2021-06-30 15:57:56 +00:00
a28cb455f1
Fixed bug that kept the date enabled when the time slot was less than 30m
2021-06-30 15:41:38 +00:00
80898ea706
Revamp bookings page
2021-06-30 15:14:10 +01:00
8b00475b27
remove unnecessary guard
2021-06-30 16:52:18 +03:00
e10030e18b
fix api 500 and redirect to login if not authenticated when accessing /settings/team
2021-06-30 16:48:34 +03:00
8c589b9dc1
Merge branch 'main' into feature/scheduling
2021-06-30 01:45:24 +00:00
e78a34e2ce
Implements slot logic with the DatePicker, more tests for slots
2021-06-30 01:35:08 +00:00
5d30586a24
Heavily simplified the startTime and endTime display by removing dayjs from SetTimesModal
2021-06-29 22:00:25 +00:00
3aa1e1716d
Merge pull request #327 from Malte-D/hotfix/book-user
...
hotfix for api/book/user
2021-06-29 17:20:49 +01:00
dfb9870894
hotfix
2021-06-29 18:17:09 +02:00
51c0556d30
Hide Calendso branding
2021-06-29 17:08:55 +01:00
099186fdd9
Merge branch 'main' into bugfix/zoom-invalid-token
2021-06-29 16:19:20 +01:00
113185e089
Merge pull request #323 from mihaic195/fix/add-login-link-on-forgot-password-page
2021-06-29 09:50:56 +01:00
39df7d61bc
fix: add login link on forgot password page
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.
2021-06-29 01:45:58 +00:00
d1bdac45eb
dont allow user to book a past date
2021-06-28 19:39:08 -05:00
f918f220eb
Fixed Zoom Auth
2021-06-29 02:21:08 +02:00
b4272ad7aa
Merge branch 'main' of github.com:calendso/calendso into feature/scheduling
2021-06-28 19:53:07 +00:00
1eba242820
Compare busyTimes in UTC, re-implement hasErrors
2021-06-27 22:30:11 +00:00
7030851efb
Merged with main, fixed issue that caused multiple AvailableTimes refreshes.
2021-06-27 21:34:38 +00:00
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
b5b480f7e2
hotfix for booking
2021-06-26 19:48:24 +02:00
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
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
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
e883ab591a
simplify expiry calculation, timezone unneccessary
2021-06-25 09:23:32 -05:00
6fec24a69d
use lib folder
2021-06-25 09:21:21 -05:00
ad657c0261
use proper response code
2021-06-25 09:17:39 -05:00
2c29368337
fix: passwordResetLink uses correct page
2021-06-25 09:16:24 -05:00
28edb86c14
Don't render location if there is none for now
2021-06-24 22:48:01 +00:00
bc47975316
Added zoom as an event location and fixed ESLint
2021-06-25 00:26:55 +02:00
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
a53cdf2660
fix: issue where user could book a meeting when unavailable
2021-06-24 16:21:25 -05:00
9c3eea5257
booking hotfix
2021-06-24 20:41:26 +02:00
646ff4a107
eslint fixes
2021-06-24 18:12:22 +02:00
917b2c4821
Merge branch 'main' into feature/refresh-tokens-and-error-handling
2021-06-24 18:03:54 +02:00
ab1298e2ca
Allow user to reset password
2021-06-24 11:01:41 -05:00
ea5692c20c
Add bookings page
2021-06-24 11:01:41 -05:00
ebb3e87284
Add bookings page
2021-06-24 14:36:31 +01:00
1668785678
Prevent users from entering mixed case usernames
...
Booking pages are case insensitive new, so no more case sensitive
usernames.
2021-06-23 16:10:58 +00:00
afa2e19f03
added more meta data to booking page
2021-06-23 12:14:19 +01:00
629a34262e
Merge branch 'main' into bugfix/lowercase-usernames
2021-06-23 11:29:56 +01:00
c428c3f80e
Merge pull request #300 from Malte-D/feature/og-image
...
Added og-image to booking pages
2021-06-22 19:24:45 +01:00
0e27e7e3d9
changed og-image link
2021-06-22 20:14:28 +02:00
892ba8a335
Lowercase the router.query.user & some typescript fixes
2021-06-22 17:42:32 +00:00
e4b977c001
fix for single quotes
2021-06-22 18:01:03 +02:00
a3b4cbeadd
use https://github.com/calendso/og-image to show dynamic og-image of booking links with avatar and title of booking.
2021-06-22 17:52:52 +02:00
1dce84fa8f
Merge branch 'main' into feature/scheduling
2021-06-22 15:19:28 +00:00
6c6d262184
Merge pull request #299 from Malte-D/bugfix/edit-custom-inputs
...
added edit/remove for customEventTypeInputs
2021-06-22 16:15:45 +01:00
0ea36cb3f8
added edit/remove for customEventTypeInputs
2021-06-22 17:10:52 +02:00
78451a98b1
Updated timeFormat to something more sensible
2021-06-22 14:25:01 +00:00
a486d1eb02
Add some extra states
2021-06-22 15:05:15 +01:00
0c8d2c74de
Merge pull request #292 from emrysal/feature/decrease-conflicts-booking-page-by-component-splitting
...
Added <AvailableTimes /> and <TimeOptions /> components
2021-06-22 09:24:19 +01:00
7690350124
feat: allow users to set google meet as a location for events ( #287 )
...
* feat: allow users to set google meet as a location for events
- add google meet location with support for other integrations
* return location types from server
also avoids potential leaks of user credentials
* chore: remove unused variable
* fix: return minimal required data from server
2021-06-21 18:15:29 -05:00
b2812deeff
Merge branch 'main' into feature/scheduling
2021-06-21 20:37:19 +00:00
b50fe16566
Moved DatePicker and PoweredByCalendso to seperate components
2021-06-21 20:26:04 +00:00
22a009edd2
fixes after merge
2021-06-21 18:15:05 +02:00
88ab985ac4
Merge branch 'main' into feature/refresh-tokens-and-error-handling
...
# Conflicts:
# lib/calendarClient.ts
# pages/[user]/[type].tsx
# pages/[user]/book.tsx
# pages/api/book/[user].ts
2021-06-21 17:56:14 +02:00
f2265fdbd7
Revert "Revert "Fixed cancellation bug: "cannot read property 'length' of null"""
...
This reverts commit de4c8f75e0
2021-06-21 07:31:39 -05:00
88fc22ddd4
Updated to latest
2021-06-21 10:39:01 +00:00
e9b75b90ba
Merge branch 'main' into feature/custom-fields-on-the-booking-page
2021-06-21 11:35:59 +01:00
931e6b26f1
error handling WIP
2021-06-20 21:02:15 +02:00
f99729c392
Merged with main
2021-06-20 17:52:18 +00:00
ebc42f0c96
Merge branch 'main' into feature/zoom-integration
...
# Conflicts:
# lib/calendarClient.ts
# lib/emails/new-event.ts
# pages/[user]/book.tsx
# pages/api/availability/[user].ts
# pages/api/book/[user].ts
# pages/integrations/index.tsx
2021-06-20 16:37:51 +02:00
a463fded8f
Added <AvailableTimes /> and <TimeOptions /> components
2021-06-20 14:19:41 +00:00
d904dd7a00
AvailableTimes refactor complete, it all seems much simpler now
2021-06-20 00:10:08 +00:00
b423f2894a
WIP to save progress
2021-06-19 22:50:47 +00:00
6dc5efd6ee
fixed additional notes
2021-06-19 21:54:22 +02:00
653509d655
formatting cleanup
2021-06-19 21:51:18 +02:00
639341f701
show custom inputs on booking screen
2021-06-19 21:44:36 +02:00
543482ca52
Merge branch 'main' into feature/custom-fields-on-the-booking-page
...
# Conflicts:
# pages/api/availability/eventtype.ts
# pages/availability/event/[type].tsx
2021-06-19 20:47:31 +02:00
ad0b561cca
fix: eventType not defined on [user]/[type]
2021-06-19 10:17:23 -05:00
de4c8f75e0
Revert "Fixed cancellation bug: "cannot read property 'length' of null""
2021-06-19 09:14:24 -05:00
11fc0f0d2a
Merge pull request #286 from Nico-J/bugfix/cancellation-eventtype-null
2021-06-19 09:24:19 +01:00
11ba59be9c
Fixes #281
2021-06-19 03:40:38 +02:00
cc1b3fa7dd
Return 404 when requesting event url that does not exist
2021-06-18 20:41:12 +00:00
95a99c620e
selected calendars hotfix
2021-06-18 22:11:13 +02:00
76b72f64d8
event type custom input WIP
2021-06-18 21:58:42 +02:00
2441f47c10
Fix layout issue with event types
2021-06-18 17:21:39 +01:00
81246edab2
Merge pull request #268 from emrysal/hotfix/ics-month-error
...
Fixes #266 : ICS event is off by one month
2021-06-18 17:04:37 +01:00
1b1c712c89
Merge branch 'main' into feature/add-buffer-times-for-appointments
2021-06-18 17:04:05 +01:00
90c1ff25bf
Merge branch 'main' into feature/customise-event-names
2021-06-18 17:00:52 +01:00
2960463f77
Merge pull request #267 from Malte-D/feature/select-calendars-to-check-for-availability
...
Feature: select calendars to check for availability
2021-06-18 17:00:05 +01:00
50bc6b480e
minor change
2021-06-18 14:00:53 +02:00
8bf556c742
Merge pull request #279 from emrysal/bugfix/useEffect-fires-twice
...
Updated useEffect so it only fires once (added [])
2021-06-18 11:35:41 +01:00
7584b77811
Updated useEffect so it only fires once (added [])
2021-06-17 19:29:42 +00:00
b3c5752d67
updated integration description
2021-06-17 17:06:32 +01:00
869ba9b97c
Implemented reschedule mail and fixed bug that rescheduling weren't saved
2021-06-17 02:44:13 +02:00
a11641d7b9
Implemented common availability
2021-06-17 01:41:56 +02:00
3366a05c1d
Implemented legacy method to send email even if there is no integration
2021-06-17 01:04:08 +02:00
f56ced0ff1
Re-implemented event confirmation mails object based
2021-06-17 00:56:02 +02:00
e3dbc52676
Cleaned up loading the availability schedule
2021-06-16 22:50:58 +00:00
9d5186f1e3
Functionality works, only thing left is a bit of cleaning up and all done
2021-06-16 22:27:27 +00:00
04e0b55b51
Introduced more classes for event mails
2021-06-17 00:26:51 +02:00
e37dd017c8
Introduced EventOwnerMail and VideoEventOwnerMail as class based implementations
2021-06-16 23:40:13 +02:00
51a8bafaa7
Full zoom integration (except availability check)
2021-06-16 22:14:44 +02:00
1de9ccff3a
minor changes
2021-06-16 14:04:04 +01:00
ea75e8974d
added getinitialprops
2021-06-16 13:44:25 +01:00
87f7984d76
added billing to settings
2021-06-16 13:42:30 +01:00
68bca9e703
Implemented a configurable buffer between events
2021-06-15 18:19:00 +02:00
738d91787b
changed naming
2021-06-15 17:27:56 +02:00
4fb0fbfe07
Made event name customizable
2021-06-15 17:26:16 +02:00
dbd1721405
Fixes #266 : ICS event is off by one month
2021-06-14 19:00:37 +00:00
03f583b021
Save WIP
2021-06-14 18:53:20 +00:00
ad69feed70
Merge branch 'main' into feature/select-calendars-to-check-for-availability
2021-06-14 20:13:36 +02:00
4caac5a88c
Layout fix
2021-06-14 19:55:55 +02:00
d3b8431699
Implemented calendar selection for availability checking.
...
Also upgraded outlook integration to be able to check all calendars instead of only the default one.
2021-06-14 19:45:24 +02:00
49abf06ce6
Deleting zoom also works
2021-06-14 19:00:17 +02:00
c4455b74ba
Rescheduling zoom works
2021-06-14 18:55:20 +02:00
8e9868db30
Properly concat results and properly handle zoom meeting uuids
2021-06-14 18:47:05 +02:00
7ecb7f22e3
Merge branch 'main' into feature/zoom-integration
2021-06-14 17:17:09 +02:00
2ba98c5dac
Test setup to try zoom meeting creation
2021-06-13 15:57:01 +02:00
30f30d7669
Renamed zoom to zoomvideo
2021-06-13 14:04:03 +02:00
0bb4678bf7
Added subtitle to zoom integrations
2021-06-13 13:59:40 +02:00
8227e733e6
Append reschedule/cancel also to event description
2021-06-13 00:37:35 +02:00
65c7960b76
Merge branch 'main' into feature/invite-external-users
2021-06-11 22:02:07 +01:00
734d9ad243
Save whole JSON
2021-06-11 02:32:07 +02:00
00f19bd654
Added integration to UI
2021-06-11 02:29:43 +02:00
a9a569f876
Removed scopes variable
2021-06-11 02:17:22 +02:00
f44c8b6326
Potentially first working version of token fetching for zoom
2021-06-11 02:14:36 +02:00
697cae9cc9
Very rudimentary development version of zoom auth #6
2021-06-11 02:13:02 +02:00
65a029acde
Very rudimentary development version of zoom auth #5
2021-06-11 02:10:56 +02:00
615e59cde7
Very rudimentary development version of zoom auth #4
2021-06-11 02:08:47 +02:00
46474c9c70
Very rudimentary development version of zoom auth #3
2021-06-11 02:07:02 +02:00
a2f1462f10
Very rudimentary development version of zoom auth #2
2021-06-11 02:03:48 +02:00
b5733716de
Very rudimentary development version of zoom auth
2021-06-11 01:37:58 +02:00
b7b644998a
Merge pull request #258 from Nico-J/bugfix/no-emails-sent-when-no-integration-added
2021-06-10 22:22:10 +01:00
17ccf42976
Merge pull request #257 from Nico-J/feature/button-for-new-integration
2021-06-10 22:21:50 +01:00
cb9d749310
Send email when no integrations are present as well
2021-06-10 23:18:57 +02:00
d249c62620
Added button to add integrations
2021-06-10 22:54:48 +02:00
16b090efd4
Codestyle adjusted & fixed the column behaviour on mobile
2021-06-10 18:49:11 +00:00
4dacf64a18
Merge pull request #253 from Nico-J/feature/cancel-reschedule-links
2021-06-10 07:53:38 +01:00
3d4222c631
Merge branch 'main' into feature/cancel-reschedule-links
2021-06-10 08:33:39 +02:00
01da470664
Removed whitespaces
2021-06-10 01:19:46 +02:00
6c92e2fe1b
Implemented short UUID as UID
2021-06-10 00:51:09 +02:00
e5dc036c50
Replaces nulls with empty strings
2021-06-10 00:50:45 +02:00
9aeb996aef
Adds a bit of margin to left and right for better mobile display
2021-06-09 21:47:00 +00:00
40eb9036f4
Implements inviting external users to teams
2021-06-09 21:43:37 +00:00
f24ca5b672
Fixed incorrect variable & also clears old errors now
2021-06-09 20:32:02 +00:00
af08c74c8a
Implemented rescheduling and concurrent usage of all integrations
2021-06-09 21:46:41 +02:00
e92b2e01fc
UI for rescheduling
2021-06-09 20:28:39 +02:00
e8a5357a89
Restricted usernames to be unique, removes the potential for username conflicts
2021-06-09 12:26:00 +00:00
7d81a1f1fb
Minor UI changes to teams
2021-06-08 17:00:06 +01:00
72a07770e8
Implemented link generation in mails
2021-06-08 17:24:06 +02:00
27194ef68c
Fixed bug where null email address could occurr in office365 credential key
2021-06-07 20:21:38 +02:00
2b84612e5d
Request offline_access in first office365 step
2021-06-07 19:30:09 +02:00
7df41b519f
Use NEXTAUTH_URL to define the BASE_URL, then use that in invite email
2021-06-07 16:57:59 +00:00
5d3e39ea6e
Better error handling during team member invitation
...
Now tells you if you have already added this member / invite is pending.
Behaviour a little bit more predictable during team editting.
2021-06-07 15:12:00 +00:00
1daf9bd3f7
Use id
2021-06-07 09:56:15 +02:00
d2934a45ff
Use RefUid
2021-06-07 09:44:56 +02:00
38b6d1c3e9
Properly get eventId
2021-06-07 09:37:28 +02:00
29fef04620
Moved delete request
2021-06-07 09:21:46 +02:00
ce8cca8a39
Fix: Check if credentials present
...
Fix: Request credentials as well
2021-06-07 09:18:41 +02:00
Alex van Andel