Commit Graph

8178 Commits (35561747c66b51af3f25f1c2b4a43c80df553fea)

Author SHA1 Message Date
Alan 35561747c6 merge with remote main 2023-09-27 15:30:25 -07:00
alannnc 403d08de41
fix: update-stripe-presented-currency (#11431)
* Edit stripe currency

* add simple test for stripe change currency

* Undo import removed
2023-09-27 21:30:22 +00:00
Vijay d7c3132fa5
fix: #10789 Prevent Double Booking (for requests that require confirmation) (#10882)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: zomars <zomars@me.com>
2023-09-27 20:54:22 +00:00
Alan 6e80abc82f requested changes: move code from core to file, fix for trpc usecontext 2023-09-27 13:26:07 -07:00
Alan a562842a8d Merge branch 'feat/alby' of ssh://github.com/rolznz/cal.com into feat/alby 2023-09-27 12:43:06 -07:00
Alan b0c0a60a20 improvements for other payment apps 2023-09-27 12:42:47 -07:00
Keith Williams a2df323cf8
fix: credential sync app lookup (#11530) 2023-09-27 17:50:16 +01:00
Annlee Fores fe82d88adf
fix: change localhost:3000 to Gitpod workspace URL (#10470)
Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2023-09-27 15:54:45 +00:00
Nafees Nazik 01e2ba3fd9
fix: app crashing due to invalid hex (#11542) 2023-09-27 10:58:52 -03:00
Ahmad c9b87bbf85
feat: Paid and confirmed booking should be able to be rescheduled v1 (#11417)
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2023-09-27 13:49:13 +00:00
nitinpanghal 19e6dbb781
fix: removed duplicate account delete confirmation text (#11520)
Co-authored-by: Nitin Panghal <nitin.panghal@unthinkable.co>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2023-09-27 13:46:24 +00:00
Hariom Balhara 3a90740c8e Update yarn.lock 2023-09-27 17:52:41 +05:30
Syed Ali Shahbaz a3a49f9069
add team availability doc (#11554) 2023-09-27 15:46:07 +04:00
Nafees Nazik 468da1f35a
feat: ability to reorder fields in multiple select in Routing Forms (#10927)
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
2023-09-27 12:22:57 +01:00
Alex van Andel ec4e2f5996
fix: Blank state wouldn't set 'schedule'; resulting toggle had no effect (#11335) 2023-09-27 11:26:55 +02:00
Denzil Samuel 8a413a97b4
fix: allow different casing for team (#11546) 2023-09-27 10:50:04 +02:00
Chiranjeev Vishnoi c275981be6
fix: profile slug added on create your first event type dialog (#11494) 2023-09-27 10:00:17 +02:00
Roland Bewick cde395b1fa fix: bookingsResult paid check 2023-09-27 12:03:11 +07:00
Roland Bewick 73aa61d532 chore: move price formatting to lib function 2023-09-27 11:53:46 +07:00
Nafees Nazik ce13350d5d
fix: form input not being saved after "back" (#11540)
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
2023-09-27 04:39:37 +00:00
Roland Bewick c98c12c01f chore: update TODOs 2023-09-27 11:32:00 +07:00
Alan d6ff14ce91 merge with remote 2023-09-26 16:33:04 -07:00
Alan f6bf9e66ef merge with main remote 2023-09-26 16:30:51 -07:00
Alan 7aafceb87d Several fixes 2023-09-26 16:27:55 -07:00
Joe Au-Yeung 919066222b
fix: Dynamic events prevent fetching all users that share a username [CAL-2409] (#11288)
* For dynamic search users based on org

* Type fix

---------

Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2023-09-26 22:50:10 +01:00
Carina Wollendorfer 79b60adf9b
fix: timezone of default schedule should change if profile timezone is updated (#11533)
* change tz of default schedule

* make sure user has at least one schedule

---------

Co-authored-by: CarinaWolli <wollencarina@gmail.com>
2023-09-26 20:41:16 +01:00
Peer Richelsen 1d882e6b3b
Update semantic-pull-requests.yml 2023-09-26 17:51:02 +01:00
Peer Richelsen 7f7841fabc
Update welcome-new-contributors.yml 2023-09-26 17:49:49 +01:00
Peer Richelsen 260064c836
Rename merge-conflict to merge-conflict.yml 2023-09-26 17:47:20 +01:00
Richard Poelderl 8c8be1efa3
add preview token to `website` (#11535) 2023-09-26 15:28:57 +00:00
Crowdin Bot 9084cc6677 New Crowdin translations by Github Action 2023-09-26 15:05:48 +00:00
Richard Poelderl fda3192d53
fix: changed Japanese translations on booking page to better match the scenario. (#10416) (#11529)
Co-authored-by: sajanlamsal <saznlamsal@gmail.com>
2023-09-26 16:01:06 +01:00
Hariom Balhara 4acfb4b28c
fix: Prefill issue when name isn't present and add unit tests (#11418)
* Fix yarn.lock

* Add tests for getBookingResponsesSchema

* Fix prefill failing if name isnt provided

* More tests and another fix
2023-09-26 16:16:31 +05:30
Udit Takkar a0642598ab
test: private team test (#11523) 2023-09-26 10:48:43 +02:00
Roland Bewick e1fd458f7e feat: include price in booking email from payment success webhook 2023-09-26 14:40:10 +07:00
Roland Bewick 71370056e7 fix: typecheck error 2023-09-26 14:18:46 +07:00
Roland Bewick 895a5ad39a fix: typecheck errors 2023-09-26 14:13:09 +07:00
Roland Bewick d2b2af71b1 chore: add sats suffix for BTC price 2023-09-26 14:02:58 +07:00
Roland Bewick 8ed7ffd4fc chore: update comments, replace fixme with todo 2023-09-26 13:52:58 +07:00
alannnc 509906da27
Merge branch 'main' into feat/alby 2023-09-25 14:19:39 -07:00
Alan 1bdf1ce081 Merge branch 'feat/alby' of ssh://github.com/rolznz/cal.com into feat/alby 2023-09-25 14:18:42 -07:00
Alan af1030abc0 nit changes 2023-09-25 14:18:18 -07:00
alannnc 2ccc3e1783
Update packages/app-store/alby/components/AlbyPaymentComponent.tsx 2023-09-25 14:03:28 -07:00
alannnc 20282a16f7
fix: verify-rerender-checkout-stripe-session (#11493) 2023-09-25 10:57:02 -07:00
Shivam Kalra 69120095e4
fix: username change test (#11511) 2023-09-25 13:35:02 +00:00
Peer Richelsen bfc137c349
fix: icons for dark mode (#11309) 2023-09-25 15:20:28 +02:00
Udit Takkar 13caf6f2cd
fix: add a default timezone (#11475)
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2023-09-25 15:08:41 +02:00
Alex van Andel 1d4eeab33e
fix: Salesforce by wrapping the refresh logic in a try/catch (#11508) 2023-09-25 11:33:53 +00:00
Peer Richelsen 3bee2d705f
chore: removed ring from org avatar (#11498) 2023-09-25 10:50:08 +00:00
Alex van Andel 9c621bf726
Update the oauth imports to _utils/oauth (#11507) 2023-09-25 09:50:17 +00:00