Commit Graph

7351 Commits (02e34a7bded5b92be101c169b408697056c1e88b)

Author SHA1 Message Date
Alex van Andel 4010fb9075 Small adjustments to the From behaviour, send as Calendso or via user depending on who you are sending to. 2021-05-28 11:16:19 +00:00
Alex van Andel 89cefa9894 Removed left-over console.log 2021-05-27 22:26:10 +00:00
Alex van Andel adbf0476ad Merge branch 'main' into feature/mailings 2021-05-27 22:12:17 +00:00
Alex van Andel cf3713d3a1 Implemented mailing for Calendso instances
added two templates, confirm-booked (sent to invitee) and new-event (sent to agent, for the time being only when no calendar integrations exist).
2021-05-27 22:10:20 +00:00
Bailey Pumfleet 6023a8a314 Add loading spinner to book button 2021-05-27 21:34:02 +01:00
Bailey Pumfleet 01d150092f Mobile UI fixes 2021-05-26 20:47:06 +01:00
Bailey Pumfleet efa443a912
Merge pull request #216 from emrysal/feature/sticky-time-options
Implemented sticky time options based on localStorage
2021-05-26 19:56:00 +01:00
Alex van Andel cf06e91e30 Implemented sticky time options based on localStorage 2021-05-26 18:40:22 +00:00
Bailey Pumfleet 2726c8c87b Add embed section in Settings 2021-05-26 17:24:10 +01:00
Bailey Pumfleet 7d6a631f5d Round available hours if necessary 2021-05-25 21:34:18 +01:00
Bailey Pumfleet e909bc22e7
Merge pull request #212 from emrysal/simplify-counting-use-length-instead
Removed unnecessary DB calls & changes everything to use session.user.id
2021-05-25 21:19:29 +01:00
Alex van Andel c610874ec4 Removed unnecessary DB calls & changes everything to use session.user.id 2021-05-22 19:12:06 +00:00
Bailey Pumfleet 62efa26443
Merge pull request #206 from hedwardd/feature/WeekStartDay
Add ability to select first day of week
2021-05-21 21:04:54 +01:00
Bailey Pumfleet 752aad342e Update prisma 2021-05-21 21:03:36 +01:00
Heath Daniel 71e50c58d6 Add ability to select first day of week 2021-05-17 18:10:40 -04:00
Peer Richelsen 8e1d688ae2 fixed mobile menu layout 2021-05-17 18:50:30 +01:00
Bailey Pumfleet 2d0b5709a1
Merge pull request #199 from jasmeetsohal/different-colors-feature
add random bullet color in user's events list
2021-05-17 10:16:08 +01:00
jasmeetsohal cf13dcc023 add random bullet color in list user's events 2021-05-13 23:05:28 +05:30
Bailey Pumfleet f66a59b7e3 Update donation banner 2021-05-13 15:44:48 +01:00
Bailey Pumfleet 7b387d6ab5
Merge pull request #198 from calendso/self-host-banner
added donation banner for self-hosted
2021-05-13 15:38:33 +01:00
Peer Richelsen 8fe7de9d02 added donation banner for self-hosted 2021-05-13 14:07:27 +01:00
Peer_Rich 8d9379e0e8
updated product screenshot 2021-05-12 13:21:14 +01:00
Bailey Pumfleet 6e300f0db1
Merge pull request #147 from jfernandogt/main
feat: Add support for multiple google calendars
2021-05-11 16:04:31 +01:00
Bailey Pumfleet 3b16a3159f Fix styling of react timezone inputs 2021-05-11 15:49:00 +01:00
Fernando Barrios 91d71d61ae fix: Allow to read calendars ended with google.com 2021-05-11 07:27:06 -06:00
Fernando Barrios 5f101ca5fc feat: Add support for multiple google calendars 2021-05-11 07:27:06 -06:00
Bailey Pumfleet e845673662
Merge pull request #177 from jfernandogt/add-gravatar-support
feat: Add support to use gravatar as a fallback avatar
2021-05-11 14:26:43 +01:00
Bailey Pumfleet 3a6eae8b8f Update dashboard 2021-05-11 14:11:17 +01:00
Bailey Pumfleet 209791d86d Get user ID from session instead of looking it up 2021-05-11 10:21:05 +01:00
Bailey Pumfleet b760ed6ff7
Merge pull request #181 from emrysal/bugfix/ensure-utc-plugin-is-enabled 2021-05-10 18:00:32 +01:00
Alex van Andel 6b38fd7550 Fixes UTC issue to success page when refreshed 2021-05-10 16:35:48 +00:00
Bailey Pumfleet 1ab1dfc669
Merge pull request #180 from parasg1999/feature/overlappingAppointment
fix: check for overlapping appointments
2021-05-10 11:28:57 +01:00
Paras Gupta 977e879406 fix: busy time in slot interval 2021-05-10 02:48:12 +05:30
Paras Gupta 3da430b577 fix: check for overlapping appointments 2021-05-10 02:28:05 +05:30
Bailey Pumfleet 2baf42fd80
Merge pull request #178 from emrysal/hotfix/booking-page-broken-when-locations-null 2021-05-09 09:25:17 +01:00
Alex van Andel e8ed94d849 Default [] value for locations array on booking page 2021-05-08 22:17:25 +00:00
Fernando Barrios ba2feb2c15 feat: Add support to use gravatar as a fallback avatar 2021-05-08 14:26:19 -06:00
Bailey Pumfleet dc09fc833b
Merge pull request #176 from emrysal/feature/implement-phone-and-physical-locations
Implemented configurable eventType phone or physical locations.
2021-05-08 20:49:04 +01:00
Bailey Pumfleet ef5403527e
Merge pull request #175 from emrysal/hotfix/node-v16-crash-#174
Upgraded prisma to v2.22.1
2021-05-08 20:47:46 +01:00
Bailey Pumfleet 69434d1306
Merge pull request #146 from PabloCastellano/patch-2
Update README.md: Google API instructions
2021-05-08 20:47:15 +01:00
Bailey Pumfleet 73ea6b8a8a
Update README.md 2021-05-08 20:46:37 +01:00
Alex van Andel a6c3c7fbb3 Implemented configurable eventType phone or physical locations. 2021-05-08 19:03:47 +00:00
Alex van Andel caabdd2659 Upgraded prisma to v2.22.1 2021-05-07 21:57:55 +00:00
Bailey Pumfleet 640ea4031d
Merge pull request #159 from rymaju/feature/close_modal
Fix bug when dismissing modal on availability page
2021-05-07 20:43:22 +01:00
Bailey Pumfleet c867edcad8
Merge pull request #169 from emrysal/feature/server-side-settings-redirect
Added redirects() entry to next.config.js, changed Settings url to /settings/profile
2021-05-07 20:41:43 +01:00
Bailey Pumfleet 99ddb8a054
Merge pull request #170 from emrysal/bugfix/crash-when-username-does-not-exist-#144
Check if user exists or return a 404 before proceeding
2021-05-07 20:40:42 +01:00
Bailey Pumfleet 5615db5491
Merge branch 'main' into bugfix/crash-when-username-does-not-exist-#144 2021-05-07 20:40:12 +01:00
Bailey Pumfleet 7cf0504ce6
Merge pull request #171 from emrysal/feature/simplify-code-by-handling-auth-in-shell-component
Removed redirect clientside session logic from pages and moved to shell
2021-05-07 20:39:02 +01:00
Bailey Pumfleet a001fe123c
Merge pull request #172 from vklimontovich/main
Telemetry improvements
2021-05-07 20:37:24 +01:00
Bailey Pumfleet 5553d14631
Merge branch 'main' into main 2021-05-07 20:37:18 +01:00