35561747c6
merge with remote main
2023-09-27 15:30:25 -07:00
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
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
6e80abc82f
requested changes: move code from core to file, fix for trpc usecontext
2023-09-27 13:26:07 -07:00
a562842a8d
Merge branch 'feat/alby' of ssh://github.com/rolznz/cal.com into feat/alby
2023-09-27 12:43:06 -07:00
b0c0a60a20
improvements for other payment apps
2023-09-27 12:42:47 -07:00
01e2ba3fd9
fix: app crashing due to invalid hex ( #11542 )
2023-09-27 10:58:52 -03:00
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
ec4e2f5996
fix: Blank state wouldn't set 'schedule'; resulting toggle had no effect ( #11335 )
2023-09-27 11:26:55 +02:00
cde395b1fa
fix: bookingsResult paid check
2023-09-27 12:03:11 +07:00
73aa61d532
chore: move price formatting to lib function
2023-09-27 11:53:46 +07:00
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
c98c12c01f
chore: update TODOs
2023-09-27 11:32:00 +07:00
d6ff14ce91
merge with remote
2023-09-26 16:33:04 -07:00
f6bf9e66ef
merge with main remote
2023-09-26 16:30:51 -07:00
7aafceb87d
Several fixes
2023-09-26 16:27:55 -07:00
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
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
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
a0642598ab
test: private team test ( #11523 )
2023-09-26 10:48:43 +02:00
e1fd458f7e
feat: include price in booking email from payment success webhook
2023-09-26 14:40:10 +07:00
895a5ad39a
fix: typecheck errors
2023-09-26 14:13:09 +07:00
d2b2af71b1
chore: add sats suffix for BTC price
2023-09-26 14:02:58 +07:00
8ed7ffd4fc
chore: update comments, replace fixme with todo
2023-09-26 13:52:58 +07:00
509906da27
Merge branch 'main' into feat/alby
2023-09-25 14:19:39 -07:00
1bdf1ce081
Merge branch 'feat/alby' of ssh://github.com/rolznz/cal.com into feat/alby
2023-09-25 14:18:42 -07:00
af1030abc0
nit changes
2023-09-25 14:18:18 -07:00
2ccc3e1783
Update packages/app-store/alby/components/AlbyPaymentComponent.tsx
2023-09-25 14:03:28 -07:00
bfc137c349
fix: icons for dark mode ( #11309 )
2023-09-25 15:20:28 +02:00
13caf6f2cd
fix: add a default timezone ( #11475 )
...
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2023-09-25 15:08:41 +02:00
1d4eeab33e
fix: Salesforce by wrapping the refresh logic in a try/catch ( #11508 )
2023-09-25 11:33:53 +00:00
3bee2d705f
chore: removed ring from org avatar ( #11498 )
2023-09-25 10:50:08 +00:00
9c621bf726
Update the oauth imports to _utils/oauth ( #11507 )
2023-09-25 09:50:17 +00:00
70461b2718
feat: Zoho Calendar ( #10429 )
...
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: aar2dee2 <85004512+aar2dee2@users.noreply.github.com>
2023-09-25 14:04:37 +05:30
f8caf08ccf
fix: typecheck warnings
2023-09-23 16:46:15 +07:00
621c1538e2
fix: update comments
2023-09-23 16:20:43 +07:00
f2a5badaf9
Merge remote-tracking branch 'upstream/main' into feat/alby
2023-09-23 16:05:48 +07:00
dd6fe5a385
fix: setup page when alby is not setup yet
2023-09-23 16:04:56 +07:00
8ef09fcfd5
fix: alby app url
2023-09-23 15:13:59 +07:00
53cd01dd8f
feat: add links to and from alby setup
2023-09-23 15:12:33 +07:00
24249469ec
feat: add Alby fiat price tooltip
2023-09-23 15:00:51 +07:00
c4dd002c16
feat: listen for successful lightning payment
2023-09-23 14:42:00 +07:00
a76d1b02ef
fix: price formatting
2023-09-23 12:53:01 +07:00
798707a553
fix: incorrect client_id parameter assignment in generating access token for webex ( #11472 )
...
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
2023-09-22 19:25:00 -04:00
82d7a3db92
fix: The clickable area of the 'x' in add guests section is not user friendly ( #11434 )
...
Co-authored-by: gitstart-calcom <gitstart@users.noreply.github.com>
2023-09-22 19:15:14 -04:00
0b7e3510a5
fix : #11397 request for reschedule did not cancel initial meeting ( #11411 )
2023-09-22 19:13:17 -04:00
e0c87cf664
feat: Add ability to edit avatar ( #11399 )
...
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
2023-09-22 19:12:35 -04:00
0d653afd0c
fix: remove stripe metadata and more logos ( #11489 )
2023-09-22 14:44:45 -03:00
13597ada38
feat: show Alby connected status on setup page
2023-09-22 23:23:07 +07:00
2bf6b44c06
feat: check if alby app is setup, if not link to setup page
2023-09-22 22:03:46 +07:00
Alan