140bb3836a
v1.9.5
2022-09-12 17:12:38 -05:00
984281963e
v1.9.4
2022-09-07 19:03:31 -06:00
d0c66a0a64
v1.9.3
2022-09-05 15:26:14 -06:00
1948455be0
wip: remove metamask app ( #4049 )
...
* wip: disable metamask app
* fix: remove dont comment
* fix: remove dont comment
* Update packages/app-store/index.ts
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Update packages/app-store/index.ts
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* fix: bookingpage
* fix: remove web3Details zod
* removed unused web3
* Build fixes
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-09-02 17:55:12 -06:00
d27b7ab2c4
One playwright config to rule them all ( #4072 )
2022-09-01 20:00:48 -06:00
a97bfbb1ce
added lottie-react, added <Logo animated> for success page ( #4083 )
...
* added lottie-react, added <Logo animated> for success page
* Fixes lint issues
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2022-09-01 13:37:21 +01:00
d75a8910f6
Update all Yarn dependencies (2022-08-17) ( #3887 )
...
* Update all Yarn dependencies (2022-08-17)
* Fix package mismatches
* Submodule sync
* Type fixes
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
2022-08-29 17:55:27 -06:00
037410aea7
One jest to rule them all ( #3957 )
...
* WIP
* Consolidates jest deps
* Test fixes
* Moves jest to root
* Test fixes
* Update CalendarService.test.ts
* Cleanup
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-08-29 22:33:53 +00:00
54bd1436b1
v1.9.2
2022-08-29 16:20:20 -06:00
1d927a8b33
chore: Sync Services to update external tools ( #3814 )
...
* WIP close.com app
* Removing leaked dev key (now invalid)
* Misspelled env variable
* Making progress still WIP
* Progress + tests
* Final touches
* More unit tests
* Finished up tests
* Merge main
* Removing unneeded stuff + submodules
* Removing static props, fields fix
* Removing unneeded stuff p2
* Commenting
* Refactoring Close.com Calendar Service + initial structure
* Progress con CloseComService
* Standarizing APIs
* Zodifying
* Expanding sync services
* Sendgrid Sync Service
* using own request for sendgrid + debug logs
* Making get last booking work for console
* Helpscout dynamic app API
* Standarizing calls + adding call from booking creation
* Strategy change for last booking
* Strategy change for last booking on help scout api
* Fixing failing build
* Implementing user deletion
* Fix linting + slight cleaning
* Undoing eslint disable
* Removing more unsupported eslint properties
* Closecom as non-standard sync service
* Finishing closecom lead operations
* Fixing lint
* Guarding app from sync services
* Reverting submodules
* Applying PR feedback
* Reverting API to be plain handler
* Cleaning notes
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-08-26 15:10:12 -06:00
4ef666a610
Zoom/Hubspot Tests with MSW mocking of requests initiated from Next.js server ( #3210 )
...
* Add code from previous PR
* Remove env variables from wrong place
* Fix tests
* Remove dead code
* Package.json updates
* Fix eslint error
* Fix issue due to conflict resolution
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-08-26 12:44:02 -06:00
19e9e0083e
Static images through webpack copy ( #3986 )
...
* Static images through webpack copy
* Turn image optimisation off - not needed tbh
2022-08-26 10:31:55 -06:00
1b541ff214
Fix/connected calendar component ( #3956 )
...
* Fix for displaying connected calendars alert with test
* Fix default calendar display string when externalId its too long
* Update apps/web/components/ui/LinkText.tsx
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Omar López <zomars@me.com>
2022-08-24 19:44:14 -06:00
436f88a48e
V2 Main ( #3549 )
...
* Fix breadcrumb colors
* HorizontalTabs
* Team List Item WIP
* Horizontal Tabs
* Cards
* Remove team list item WIP
* Login Page
* Add welcome back i118n
* EventType page work
* Update EventType Icons
* WIP Availability
* Horizontal Tab Work
* Add build command for in root
* Update build DIr/command
* Add Edit Button + change buttons to v2
* Availablitiy page
* Fix IPAD
* Make mobile look a little nicer
* WIP bookingshell
* Remove list items from breaking build
* Mian bulk of Booking Page.
* Few updates to components
* Fix chormatic feedback
* Fix banner
* Fix Empty Screen
* Text area + embded window fixes
* Semi fix avatar
* Troubleshoot container + Active on count
* Improve mobile
* NITS
* Fix padding on input
* Fix icons
* Starting to move event types settings to tabs
* Begin migration to single page form
* Single page tabs
* Limits Page
* Advanced tab
* Add RHF to dependancies
* Most of advanced tab
* Solved RHF mismtach
* Build fixes
* RHF conditionals fixes
* Improved legibility
* Major refactor/organisation into optional V2 UI
* Portal EditLocationModal
* Fix dialoug form
* Update imports
* Auto Animate + custom inputs WIP
* Custom Inputs
* WIP Apps
* Fixing stories imports
* Stripe app
* Remove duplicate dialog
* Remove duplicate dialog
* Fix embed URL
* Fix app toggles + number of active apps
* Fix container padding on disabledBorder prop
* Removes strict
* EventType Team page WIP
* Fix embed
* NIT
* Add Darkmode gray color
* V2 Shell WIP
* Fix headings on shell V2
* Fix mobile layout with V2 shell
* V2 create event type button
* Checked Team Select
* Hidden to happen on save - not on toggle
* Team Attendee Select animation
* Fix scheduling type and remove multi select label
* Fix overflow on teams url
* Even Type move order handles
* Fix Embed TS errors
* Fix TS errors
* Fix Eslint errors
* Fix TS errors for UI
* Fix ESLINT error
* added SidebarCard for promo to v2 and storybook (#3906 )
Co-authored-by: Julian Benegas <julianbenegas99@gmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
* Tooltip Provider - Wrapper due to dep upgrade
* public event type list darkmode
* V2 Color changes to public booking
* Remove unused component
* Fix typecheck
* Removed extra buttons on create ET dialog
* ET edit page refactoring
* Avoids form wrapping the whole Shell
* Nitpicks
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Julian Benegas <julianbenegas99@gmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
2022-08-24 14:18:42 -06:00
4e73c4f7fb
v1.9.1
2022-08-23 09:23:08 -07:00
f4ea385c7f
Fixes collective availability for teams with overlapping day timezones ( #3898 )
...
* WIP
* Fix for team availability with time offsets
* Prevent empty schedule from opening up everything
* When no utcOffset or timeZone's are given, default to 0 utcOffset (UTC)
* timeZone should not be part of getUserAvailability
* Prevents {days:[X],startTime:0,endTime:0} error entry
* Added getAggregateWorkingHours() (#3913 )
* Added test for getAggregateWorkingHours
* Timezone isn't used here anymore
* fix: developer docs url (#3914 )
* fix: developer docs url added
* chore : remove /
* chore : import url
Co-authored-by: Zach Waterfield <zlwaterfield@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Test fixes
* Reinstate prisma (generate only) and few comments
* Test fixes
* Skipping getSchedule again
* Added await to expect() as it involves async logic causing the promise to timeout
* Test cleanup
* Update jest.config.ts
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Zach Waterfield <zlwaterfield@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-22 23:53:51 +00:00
b8acf1e180
Update all Yarn dependencies (2022-07-29) ( #3599 )
...
* Update all Yarn dependencies (2022-07-29)
* Adds syncpack config
* Fixes mismatches
* Update yarn.lock
* RRule fixes
* Locking dayjs to fix build
* Type fixes
* Fixes mismatches
* Submodule sync
* Update yarn.lock
* Update event.ts
* Conflict fixes
* Fixes prisma warnings
* Liting
* Upgrade next, zod
* Prevents articfact overwriting
* Yarn fixes
* Jest fixes
* Submodule sync
* Formatting
* Submodule sync
* Adds provider for react-tooltip
* Removed dotenv-cli
* Readds dotenv-cli
* Skips getSchedule tests
Until prisma is mocked properly
* Fixes
* Revert prisma seed script
* E2E fixes
* test
* Removed deprecated req.page in middleware
* Make tests stable
* Unskip getSchedule tests
* fixed 404 logo on cal video (#3885 )
* Removed PW aliases as aren't needed anymore
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-17 11:38:21 -06:00
8d0caa522e
v1.9.0
2022-08-15 14:24:26 -06:00
297a965508
Bugfix/i3531 round robin assigns to unavailable members ( #3813 )
...
* wip commit
* Finished new algorithm for fetching the least recently booked user
* ROUND_ROBIN fix
* Removed redundant import
* Prisma dependency turned getLuckyUser into a server-only function
* DRY avatars
* Properly passThrough
* name can be undefined.
* Remove debug artefact
2022-08-15 13:52:01 -06:00
a2a5d48037
Upgrade turborepo v4 ( #3804 )
...
* Upgrades to turborepo 4
Adds turbo eslint config
* Linting according to turbo eslint plugin
* Add missing variables to turbo config
* Adds more missing env vars to turbo json
* Update turbo.json
* Update turbo.json
* Matches local lint with CI lint
* Update turbo.json
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-08-11 13:17:56 -06:00
e8d6d50bc2
v1.8.5
2022-08-09 16:56:53 -06:00
3ed206df23
Squashed commit of the following:
...
commit c378c647fe4822071cbdfc577fcfc950e53973df
Author: zomars <zomars@me.com>
Date: Fri Aug 5 17:36:21 2022 -0600
Cleanup
commit a89cc7981df1c2aae96188466833490eb3b227a1
Author: zomars <zomars@me.com>
Date: Fri Aug 5 17:17:57 2022 -0600
redirect fixes
commit a27979c2b3f06c9956ee9abfef1e82a5558b6411
Author: zomars <zomars@me.com>
Date: Fri Aug 5 17:02:33 2022 -0600
Fingers crossed
commit c08a09e8d2ba3eb2561f418bb3b0370245f79bf7
Author: zomars <zomars@me.com>
Date: Fri Aug 5 16:28:55 2022 -0600
Update [...nextauth].tsx
commit 4063bddb2ea3cbf3dda6be6cc10070ecc1eb578c
Author: zomars <zomars@me.com>
Date: Fri Aug 5 16:05:21 2022 -0600
Submodule sync
commit e44dc73a3b751ba4cacc85abfe6680a668393c0d
Author: zomars <zomars@me.com>
Date: Fri Aug 5 16:05:06 2022 -0600
Upgrade next-auth
commit 2b36e0a1b376083739ea06b793f1523e2f158a33
Author: zomars <zomars@me.com>
Date: Fri Aug 5 15:23:03 2022 -0600
Magic signup fixes
commit 2cc81ca7e2f79a4e3fcab370e23ac29cbe3ee18d
Author: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Date: Thu Aug 4 11:49:51 2022 -0400
Properly parse list calendar call to MS Graph (#3698 )
commit 65887d8f9db8b399964fce38ec104ed24fcc48e6
Author: Leo Giovanetti <hello@leog.me>
Date: Thu Aug 4 12:52:50 2022 -0300
Fix app-store seeding (#3693 ) (#3697 )
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
commit 71594b9623#3650 ) (#3681 )
* fixed dark mode profile page
* nit
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
commit 78a5ae9882#3671 ) (#3676 )
commit b006240b0c6179b3fbee7418f68a6179b3fbe014443099e0
2022-08-05 18:08:05 -06:00
ff3bd5fc61
Event description now supports markdown formatting ( #3688 )
...
* yarn
* yarn update
* added Mardown style formatting with sanitized inputs
* Revert "yarn"
This reverts commit 46eb3595cf46eb3595cff4600d83a646eb3595cff4600d83a68ccab5ee2378a755eb39
2022-08-05 18:44:30 +00:00
3ac140fad5
[Proposal] Event type error popover proposal ( #3627 )
2022-08-03 09:03:01 +00:00
3ae4655449
v1.8.4
2022-08-01 17:42:06 -06:00
464343f5ab
Refactors EE code ( #3490 )
...
* WIP
* WIP
* Type and migration fixes
* Adds missing default import
* Fixes import
* Fixes tRPC imports in App Store
* Migrate stripe helpers
* WIP
* Type fixes
* Type fix?
* WIP
* WIP
* Update index.ts
* Fixes
* Update workflow.tsx
* Moved queries to lib
* Moves QueryCell
* Migrates MultiSelectCheckboxes
* WIP
* CryptoSection type fixes
* WIP
* Import fixes
* Build fixes
* Update app-providers.tsx
* Build fixes
* Upgrades hookform zod resolvers
* Build fixes
* Cleanup
* Build fixes
* Relocates QueryCell to ui
* Moved List and SkeletonLoader
* Revert QueryCell migration
* Can't use QueryCell here
* oops
* CryptoSection cleanup
* Update app-providers.tsx
* Moved ee to features
* ee to features/ee
* Removes @calcom/ee
* Adds possible feature locations
* Build fixes
* Migrates stripe to app-store lib
* Colocates stripe imports
* Update subscription.ts
* Submodule sync
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-07-28 13:58:26 -06:00
2c23949cea
Add axiom to next config ( #3556 )
2022-07-27 16:19:59 -04:00
a1fcdcae44
v1.8.3
2022-07-26 18:46:14 -06:00
5ad25a692f
v1.8.2
2022-07-26 13:03:19 -06:00
ef6ed6050b
Feat: Add next-themes for theme handling ( #3263 )
...
* chore: add next-themes
* feat: add next theme provider
* fix: modify useTheme hook to use next-themes
* fix: use the new hook for theming
* remove conditional rendering with isReady boolean flag
* remove Theme component returned from useTheme hook
* Update missing useTheme usage
* Fix theme switching as per system. Also, ensure that booking and non booking pages can maintain their own requirements of theme simulatenously
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
2022-07-26 08:27:57 +00:00
9447f16b82
Migrates all tRPC code to a monorepo package ( #3484 )
...
* WIP
* WIP
* Type and migration fixes
* Adds missing default import
* Fixes import
* Fixes tRPC imports in App Store
* Migrate stripe helpers
* WIP
* Type fixes
* Type fix?
* Test fixes
* Adds missing stripe packages
* Moved queries to lib instead
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-07-22 11:27:06 -06:00
471420c1d4
Add getSchedule tests ( #3233 )
...
* Add getSchedule tests
* Add first integration test
* Update turbo.json
* Make sure unit tests run asap
* Worker threads
* Improve team event test
* Remove unrelated changes
* Improve tests readability
* Update CalendarManager.ts
* Add README
* Debug tests
* Temporarily disabled build errors
* Fix failing tests
* Remove unncessary logs
Co-authored-by: zomars <zomars@me.com>
2022-07-21 10:44:23 -06:00
be799e35d5
v1.8.1
2022-07-20 10:15:32 -06:00
77bf376c94
v1.8.0
2022-07-15 11:20:40 -06:00
58d1c28e9d
Routing Forms ( #2785 )
...
* Add Routing logic to Query builder
* Make a working redirect
* Make it an app
* Move pages and components to App
* Integrate all pages in the app
* Integrate prisma everywhere
* Fix Routing Link
* Add routing preview
* Fixes
* Get deplouyed on preview with ts disabled
* Fix case
* add reordering for routes
* Move away from react DnD
* Add sidebar
* Add sidebar support and select support
* Various fixes and improvements
* Ignore eslint temporarly
* Route might be falsy
* Make CalNumber support required validation
* Loader improvements
* Add SSR support
* Fix few typescript issues
* More typesafety, download csv, bug fiees
* Add seo friendly link
* Avoid seding credebtials to frontend
* Self review fixes
* Improvements in app-store
* Cahnge Form layout
* Add scaffolding for app tests
* Add playwright tests and add user check in serving data
* Add CI tests
* Add route builder test
* Styling
* Apply suggestions from code review
Co-authored-by: Agusti Fernandez Pardo <6601142+agustif@users.noreply.github.com>
* Changes as per loom feedback
* Increase time for tests
* Fix PR suggestions
* Import CSS only in the module
* Fix codacy issues
* Move the codebbase to ee and add PRO and license check
* Add Badge
* Avoid lodash import
* Fix TS error
* Fix lint errors
* Fix bug to merge conflicts resolution - me query shouldnt cause the Shell to go in loading state
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Agusti Fernandez Pardo <6601142+agustif@users.noreply.github.com>
2022-07-14 12:40:53 +00:00
7ec5f01647
kbar follow up ( #3361 )
...
* added more routes to kbar
* added right direction for tooltip, moved search icon next to logo, added keyboard shortcuts to command bar
* added right direction for tooltip, moved search icon next to logo, added keyboard shortcuts to command bar
* fixed search icon for tablet
* fixed search icon for mobile
* hide keyboard shortcut legend on mobile
* extracted strings
2022-07-14 11:32:28 +00:00
318ec316d5
Adds a fully extensible command(ctrl)+k interface for Cal ( #3346 )
...
* init
* action function added
* kbar trigger placed
* UI improvements to KBar, added command + K tooltip
* renamed quick find to commandbar
* replaced window router with nextjs router
* keyboard up n down nav shows up
Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-07-14 06:45:07 +00:00
f6684c001c
Fixes lint:fix script
2022-07-13 15:11:40 -06:00
c5263efce2
Adds missing linting scripts
2022-07-12 16:31:09 -06:00
b1d637d1a6
Upgrading nextjs and collect ( #3252 )
...
* Upgrading nextjs and collect
* Fixing suggestions + yarn.lock
* Updating submodules
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-07-12 11:43:53 -06:00
5fa336c195
v1.7.7
2022-07-11 19:22:45 -06:00
c2ca848f0a
Transpiling fixes
2022-07-06 14:34:49 -06:00
fa5e6b42de
v1.7.6
2022-07-04 10:51:26 -06:00
dd941e62ef
Update next-auth to version 4.5.0 ( #3138 )
2022-07-04 14:36:20 +00:00
240fc67d72
v1.7.5
2022-06-30 10:32:55 -06:00
70a31874f0
v1.7.4
2022-06-28 17:12:56 -06:00
03cc4855a8
Update package.json
2022-06-28 16:01:50 -06:00
7122a4a91d
Consolidates dayjs in a single package
2022-06-28 14:48:24 -06:00
2ba8f99302
v1.7.3
2022-06-27 18:08:18 -06:00
06b7744b30
Fixes over Turborepo improvements ( #3144 )
2022-06-24 09:38:17 -06:00
21fb0fc3a3
Turborepo improvements ( #3139 )
...
* WIP
* WIP
* Embed fixes
* Update turbo.json
* Update e2e-embed.yml
* E2E fixes
* Update turbo.json
* App store CLI cleanup
* Update turbo.json
* Update turbo.json
* Update turbo.json
* Update turbo.json
* Update turbo.json
* Update turbo.json
2022-06-22 14:41:19 -06:00
591309f335
v1.7.2
2022-06-20 13:33:00 -06:00
b3f8f9f51f
Update tailwind to 3.1.3 ( #3106 )
2022-06-19 15:13:12 +00:00
2d28ca61a4
Feature/parallel booking availability ( #3087 )
2022-06-19 16:02:00 +01:00
f239922fb6
v1.7.1
2022-06-16 11:01:57 -06:00
673633a773
v1.7.0
2022-06-15 14:57:18 -06:00
881de59bf5
Fixes node version mismatches
2022-06-13 10:59:02 -06:00
bb4875443a
Add app-store:watch a dependency of web:dev ( #3005 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-07 16:57:27 +00:00
e77ddc3d2e
Trailing unlocking node <17 ( #2711 )
...
* Trailing unlocking node <17
* Updated apps/web package.json
* Updated .nvmrc -> v16 :)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-06-07 11:53:11 +01:00
875e279def
v1.6.3
2022-06-06 14:23:10 -06:00
456a4ba581
Telemetry improvements ( #2935 )
...
* next-collect initial setup
* naming changes
* WIP
* WIP: added cookie name
* telemetry update
* fixes
* telemetry eventTypes fix
* tmp jitsu config for testing
* tmp jitsu key update (for tests)
* deploy commit
* cookieName fixes
* telemetry credentials update
* NextCollect updated to latest canary; added TELEMETRY_KEY to config
* TELEMETRY_KEY fix
removed browser_user_agent field from event
* removed _middleware.ts for test deploy
* _middleware.ts restored
* next-collect version bump
* yarn.lock fix
* Added license consent property, set default telemetry endpoint
* Switched to stable version of next-collect; restored LicenseProvider accidentally deleted during merge
* Switched to stable version of next-collect; restored LicenseProvider accidentally deleted during merge
* Updated to latest version of next-collect
* - Updated to latest version of next-collect
- Few improvements in event collection: isTeamBooking for all events, page_url for all events
- Do not send second page event on re-render of /team/[slug]
* Revert booking confirmed tracking
* Applied prettier + fix lint
Co-authored-by: Art Sk <kirsan007@gmail.com>
2022-06-02 10:19:01 -06:00
6b0cffa79a
v1.6.2
2022-05-30 12:53:07 -06:00
3035412cdc
Add embed tests in CI ( #2887 )
...
* Add embed tests in CI
* Update e2e-embed.yml
* Run quick tests only
* Ignore certain folders
* Add embed-react tests as well
* Fix commands
* Dont run unit tests
* Update playwright.config.ts
* Update playwright.config.ts
* Update playwright.config.ts
* Create correct artifcats
* Create correct artifcats
* Fi ignore path
* Update package.json
* Add back embed-react typecheck
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-30 22:41:05 +05:30
445cdd7cbf
Fix @calcom/embed-react installation with TS project ( #2870 )
2022-05-27 09:37:02 -06:00
9df4867fca
License server ( #2379 )
...
* WIP License server
* WIP
* Moves locations to App Store and Core
* LocationType fixes
* Runs db migrations post-deploy
* WIP
* WIP
* Cleanup
* WIP
* WIP
* Decouples translations from NavTabs
* Adds admin submodule
* Adds admin submodule
* Sync dependencies
* WIP
* WIP
* Updates submodules
* Renames package
* Updates submodules
* Adds scripts for console
* Updates license checker URL
* Updates admin
* Adds staging/prod admin console links
* Update yarn.lock
* Update NavTabs.tsx
* WIP
* Update admin
* WIP
* Adds hint to InputField
* Update admin
* Adds turbo admin dependecies
* Update admin
* Prevents redirection on form submit
* Form warning fixes
* Update admin
* Form fixes
* Update yarn.lock
* Update admin
* Update admin
* Update admin
* Adds withLicenseRequired HOC
* Adds LicenseRequired to EE components
* Admin deploy fix?
* Updates submodules
* Use relative inside lib
* type fixes
* Fixes turbo race condition
* Relocates admin to console
* Relocates admin to console
* Update console
* Update api
* Update turbo.json
* Update ErrorBoundary.tsx
* Update defaultEvents.ts
* Update checkLicense.ts
* Update yarn.lock
* Skip on E2E
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-05-26 11:07:14 -06:00
67770bf878
Playwright binaries shouldn't be on deps
2022-05-23 11:44:53 -06:00
db01f7be19
Update all Yarn dependencies (2022-05-16) ( #2769 )
...
* Update all Yarn dependencies (2022-05-16)
* Upgrade dependencies
* Removes deprecated packages
* Upgrades deps
* Updates submodules
* Update yarn.lock
* Linting
* Linting
* Update website
* Build fixes
* TODO: fix this
* Module resolving
* Type fixes
* Intercom fixes on SSG
* Fixes infinite loop
* Upgrades to React 18
* Type fixes
* Locks node version to 14
* Upgrades daily-js
* Readds missing types
* Upgrades playwright
* Noop when intercom is not installed
* Update website
* Removed yarn.lock in favor of monorepo
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-05-17 19:31:49 +00:00
6e2cb4f90d
v1.6
2022-05-16 15:57:29 -06:00
8b0c7f579a
v1.6
2022-05-16 15:55:16 -06:00
7fd149fd2e
Users Phone Number Option ( #2669 )
...
* Users Phone Number Option
* Implemented improvments
* Add validation to form
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-05-16 09:50:12 -06:00
4099a477d1
v1.5.4
2022-05-09 14:33:32 -06:00
6a18b40c97
Update package.json
...
Fixes v14 builds
2022-05-09 12:00:49 -06:00
44736ac461
Fix turbo caching ( #2695 )
...
* Fix turbo cachin
* Improve tests stability
2022-05-07 08:54:30 +00:00
1a79e0624c
Recurring Events ( #2562 )
...
* Init dev
* UI changes for recurring event + prisma
* Revisiting schema + changes WIP
* UI done, BE WIP
* Feature completion
* Unused query param removed
* Invalid comment removed
* Removed unused translation
* Update apps/web/public/static/locales/en/common.json
Thanks!
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Success page changes
* More progress
* Email text tweaks + test + seed
* Tweaking emails + Cal Apps support WIP
* No app integration for now
Final email and pages tweaks to avoid recurring info showed
* Missing comment for clarity
* Yet again, comment
* Last minute fix
* Missing tooltip for upcoming bookings
* Fixing seed
* Fixing import
* Increasing timeout for e2e
* Fixing any
* Apply suggestions from code review
Co-authored-by: Omar López <zomars@me.com>
* Update apps/web/pages/d/[link]/book.tsx
Co-authored-by: Omar López <zomars@me.com>
* Code improvements
* More code improvements
* Reverting back number input arrows
* Update BookingPage.tsx
* Update BookingPage.tsx
* Adds fallback for sendOrganizerPaymentRefundFailedEmail
* Type overkill
* Type fixes
* Type fixes
* Nitpicks
* Update success.tsx
* Update success.tsx
* Update success.tsx
* Fixing types
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
2022-05-05 18:16:25 -03:00
de0883b14b
v1.5.3
2022-05-02 16:07:45 -06:00
8bc5a75249
Feature: Verify login on signup with magic link. ( #2122 )
...
* manual migration to rename verificationtoken, maybe it could be dropped and create a new table instead if we're not using it, will consult @zomars
* feat: rename verificationRequest --> verificationToken in schema.prisma
* fix: rename verificationRequest -> verificationToken in the codebase
* feat: add default cookies for next-auth
* fix: moves @lib/serverConfig to @calcom/lib so it can be called by website too
* fix: make self-certificate work in dev env by not rejecting tls in serverConfig
* fix verificationTokenToken typo
Co-authored-by: Omar López <zomars@me.com>
* Adds domain: .cal.com if not dev env in cookies
* Adds default-cookies to apps/web, and nextauth_domain to turbo website build deps"a
* update NEXTAUTH_DOMAIN to NEXTAUTH_COOKIE_DOMAIN
* Updates website submodule
* Removes deprecated env vars
* Consolidates auth logic in one place
* Updates website module
* Signup fixes
* Build fixes
* Updates example
* Updates example
* Fixes
* Fix Email Verification
* fix: move csrf-token cookiePrefix from __Host -> __Secure
* Removes console log
* Fixes link in email template
* Removed irrelevant coment
* Testing with a 32 bit secret
* Fixes for cookien in E2E
* E2E fixes
* Fixes Stripe tests locally
* Temp fix for E2E
Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
2022-04-21 14:32:25 -06:00
c92070a5a2
Update package.json
2022-04-18 19:53:49 +02:00
cde131a351
Upgrades tRPC ( #2460 )
2022-04-12 09:32:14 +00:00
d7ce4fb983
Resync yarn.lock. Adding some peer deps for turbo `packages/*` ( #2262 )
...
* Resync yarn.lock & add peer deps
* Upgrades zod
Co-authored-by: zomars <zomars@me.com>
2022-04-04 16:23:42 -06:00
a7f5250b4a
Enables strict mode in nextjs apps ( #2354 )
...
- We need this so zod works correctly
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-04-04 20:26:14 +00:00
5dbb60dc85
App store mdx support ( #2325 )
...
* Adds initial MDX implementation for App Store pages
* Adds endpoint to serve app store static files
* Replaces zoom icon with dynamic-served one
* Fixes zoom icon
* Makes Slider reusable
* Adds gray-matter for MDX
* Adds zoom screenshots
* Update yarn.lock
* Slider improvements
* WIP
* Update TrendingAppsSlider.tsx
* WIP
* Adds MS teams screenshots
* Adds stripe screenshots
* Cleanup
* Update index.ts
* WIP
* Cleanup
* Cleanup
* Adds jitsi screenshot
* Adds Google meet screenshots
* Adds office 365 calendar screenshots
* Adds google calendar screenshots
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-04-04 15:21:33 +01:00
f536d1040c
App Store ( #1869 )
...
* patch applied
* patch applied
* We shouldn't pollute global css
* Build fixes
* Updates typings
* WIP extracting zoom to package
* Revert "Upgrades next to 12.1 (#1895 )" (#1903 )
This reverts commit ede0e98e1f#1905 )
* Extracts ignored createEventTypeBaseInput
* Adds postinstall script
* Revert "Tweak/gitignore prisma zod (#1905 )" (#1906 )
This reverts commit 15bfeb30d7#1898 )
* Eslint fixes
* Docs build fixes
* Upgrade to next 12.1 (#1904 )
* Upgrades next to 12.1
* Fixes build
* Updaters e2e test pipelines
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
* Fix URL by removing slash and backslash (#1733 )
* Fix URl by removing slash and backslash
* Implement slugify
* Add data type
* Fixing folder structure
* Solve zod-utils conflict
* Build fixes (#1929 )
* Build fixes
* Fixes type error
* WIP
* Conflict fixes
* Removes unused file
* TODO
* WIP
* Type fixes
* Linting
* WIP
* Moved App definition to types
* WIP
* WIP
* WIP
* WIP WIP
* Renamed zoomvideo app
* Import fix
* Daily.co app (#2022 )
* Daily.co app
* Update packages/app-store/dailyvideo/lib/VideoApiAdapter.ts
Co-authored-by: Omar López <zomars@me.com>
* Update packages/app-store/dailyvideo/lib/VideoApiAdapter.ts
Co-authored-by: Omar López <zomars@me.com>
* Missing deps for newly added contants to lib
Co-authored-by: Omar López <zomars@me.com>
* WIP
* WIP
* WIP
* Daily fixes
* Updated type info
* Slack Oauth integration - api route ideas
* Adds getLocationOptions
* Type fixes
* Adds location option for daily video
* Revert "Slack Oauth integration - api route ideas"
This reverts commit 35ffa78e92ee95795e0f#2038 )
* Jitsi Video App migration
* Removing uneeded dependencies
* Missed unused reference
* Missing dependency
`@calcom/lib` is needed in the `locationOption.ts` file
* Huddle01 migration to app store
* Jitsi Video App migration (#2027 )
* Jitsi Video App migration
* Removing uneeded dependencies
* Missed unused reference
* Missing dependency
`@calcom/lib` is needed in the `locationOption.ts` file
Co-authored-by: Omar López <zomars@me.com>
* Monorepo/app store MS Teams Integration (#2080 )
* Create teamsvideo package
* Remove zoom specific refrences
* Add teams video files
* Rename to office365_video
* Add call back to add crednetial type office365_teams
* Rename to office_video to match type
* Add MS Teams as a location option
* Rename files
* Add teams reponse interface and create meeting
* Comment out Daily imports
* Add check for Teams integration
* Add token checking functions
* Change template to create event rather than meeting
* Add comment to test between create link and event
* Add teams URL to booking
* Ask for just onlineMeeting permission
* Add MS Teams logo
* Add message to have an enterprise account
* Remove comments
* Comment back hasDailyIntegration
* Comment back daily credentials
* Update link to MS Graph section of README
* Move API calls to package
Co-authored-by: Omar López <zomars@me.com>
* Re-adds missing module for transpiling
* Adds email as required field for app store metadata
* WIP: migrates tandem to app store
* Cleanup
* Migrates tandem api routes to app store
* Fixes tandem api handlers
* Big WIP WIP
* Build fixes
* WIP
* Fixes annoying circular dependency bug
I've spent a whole day on this....
* Location option cleanup
* Type fixes
* Update EventManager.ts
* Update CalendarManager.ts
* Moves CalendarService back to lib
* Moves apple calendar to App Store
* Cleanup
* More cleanup
* Migrates apple calendar
* Returns all connected calendars credentials
* No tsx needed in calcom/lib
* Update auth.ts
* Reordering
* Update i18n.utils.ts
* WIP: Google Meet
* Type fixes
* Type fixes
* Cleanup
* Update LinkIconButton.tsx
* Update TrialBanner.tsx
* Cleanup
* Cleanup
* Type fixes
* Update _appRegistry.ts
* Update fonts.css
* Update CalEventParser.ts
* Delete yarn.lock.rej
* Update eslint-preset.js
* Delete zoom.tsx
* Type fixes
* Migrates caldav to app store
* Cleanup
* Type fixes
* Adds caldav to app store
* Test fixes
* Updates integration tests
* Moar test fixes
* Redirection fixes
* Redirection fixes
* Update timeFormat.ts
* Update booking-pages.test.ts
* Connect button fixes
* Fix empty item
* Cal fixes andrea (#2234 )
* Fixes #2178
* Fixes #2178
* Update apps/web/components/availability/Schedule.tsx
* Update apps/web/components/availability/Schedule.tsx
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Peer Richelsen <peer@cal.com>
* added meta viewport to disable zoom on input focus on mobile (#2238 )
* Update lint.yml (#2211 )
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* Fix prisma client bundle makes app slow (#2237 )
Co-authored-by: Omar López <zomars@me.com>
* Slider fixes
* Removed unused code
* Full Shell when unauthed
* App sidebar responsive fixes
* Adds dynamic install button
* Fix for duplicate connected calendars
* Various fixes
* Display notification on app delete
* Reuse connect button
* Adds CalDav button
* Deprecates ConnectIntegration
* Simplify install button
* Adds Google Calendar connect button
* Adds Office 365 Install button
* Migrates Stripe to App Store
* Zoom Install Button (#2244 )
* Fix minor css, app image load from static path
* Fix app logos remote img src (#2252 )
* Adds missing exports
* Cleanup
* Disables install button for globally enabled apps
* Update EventManager.ts
* Stripe fixes
* Disables example app
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Juan Esteban Nieto Cifuentes <89233604+Jenietoc@users.noreply.github.com>
Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: Sean Brydon <seanbrydon.me@gmail.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Co-authored-by: andreaestefania12 <andreaestefania12@hotmail.com>
Co-authored-by: Peer Richelsen <peer@cal.com>
Co-authored-by: Demian Caldelas <denik.works@protonmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
2022-03-23 15:00:30 -07:00
94f6c80d57
added helpscout ( #2204 )
...
* added helpscout
* nit
* moved all help apps into its own component
* added helpscout to .env.example
2022-03-18 15:09:13 +00:00
deffb77875
Trigger missing deploy ( #2186 )
2022-03-17 10:07:33 -07:00
424482646f
Removing headlessui used in menus ( #2127 )
2022-03-13 22:09:39 +00:00
5b4cebac16
added day, version, plan and self host (sh) or hosted (h) into left sidebar footer ( #2111 )
2022-03-13 00:07:21 +00:00
5625cf226b
Stripe to monorepo ( #2063 )
...
* downgrade func
* fix security hole lol
* fix query conditions
* - set to trial not free
- auto create stripe customer if missing
- fix production check
* Extracts downgrade logic to script, fixes ts-node conflicts with prisma
* Adds trialEndsAt field to users
* Updates trial/downgrade logic
* Typo
* Legibility fixes
* Update team-billing.ts
* Legibility improvements
* Updates illegal logic
* WIP
* WIP migrating stripe to package
* Update website
* Import fixes
* Import fixes
* Fixes to downgrade script
* Check for premium usernames before downgrading
* Fixed formatting
* Delete deploy-env.sh
* Locks dayjs to 1.10.6
* Type fixes
* Seems like we're stuck with dayjs 1.10.4
* Script fixes
* Adds first name to dump
* Loop fix
Co-authored-by: Jamie <ijamespine@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-03-09 15:56:05 -07:00
e53648d218
Linting ( #2083 )
...
* Runs yarn format
* Update website
* Web lint is failing
* Formatting
* Adds cache for dependency install
* Adds linting reports for GH
* Fixes artifact upload
* Caching tests
* Merge reports on GH actions
* Linting
* Fix prettier plugin conflicts
* Dep fixes
* Moves tailwind to monorepo package (#2091 )
* New Crowdin translations by Github Action (#2077 )
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
* fix redirection to 404 page on login (#2086 )
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
* fix: update contributing (#2084 )
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
* Formatting
* Update website
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Louis <48682663+louis-27@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-03-09 17:52:48 +00:00
622d0fd0bc
Moves tailwind to monorepo package ( #2091 )
2022-03-08 15:51:53 -07:00
0a8509d721
Admin/team billing downgrader ( #2040 )
...
* downgrade func
* fix security hole lol
* fix query conditions
* - set to trial not free
- auto create stripe customer if missing
- fix production check
* Extracts downgrade logic to script, fixes ts-node conflicts with prisma
* Adds trialEndsAt field to users
* Updates trial/downgrade logic
* Typo
* Legibility fixes
* Update team-billing.ts
* Legibility improvements
Co-authored-by: Jamie <ijamespine@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-03-03 19:29:19 +00:00
95b3397e42
Add ui package for reusable components ( #1916 )
...
* Add ui package for reusable components
* Add fallback
* Type fixes
* Type fixes
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-21 09:41:25 -07:00
e7dc2d3d7a
Upgrade to next 12.1 ( #1904 )
...
* Upgrades next to 12.1
* Fixes build
* Updaters e2e test pipelines
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-18 10:32:59 -07:00
944a3c02ce
Eslint fixes ( #1898 )
...
* Eslint fixes
* Docs build fixes
2022-02-18 16:53:45 +00:00
0bf3818b30
Revert "Upgrades next to 12.1 ( #1895 )" ( #1903 )
...
This reverts commit ede0e98e1f
2022-02-17 16:58:16 -07:00
ede0e98e1f
Upgrades next to 12.1 ( #1895 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-17 22:29:54 +00:00
fe35cf6570
Extract prisma to it's own package ( #1823 )
...
* Moved prisma to packages
* Add missing prisma configs
* Extracts common libs and types
* Build and pipeline fixes
* Adds missing package
* Prisma scripts cleanup
* Updates lint staged
* Type fixes
* Sort imports
* Updates yarn lock file
* Fixes for yarn dx
* Revert "Sort imports"
This reverts commit 076109decab9b9ba307fc03696c3b0da5c4896f3.
* Formatting
* Prevent double TS version
* Fix conflict
* Extracted e2e configs
2022-02-15 13:30:52 -07:00
f0eed8ad30
E2E fixes ( #1858 )
2022-02-15 10:44:30 -07:00
b7ad073de9
Revert "Lock Radix UI to 0.1.4 ( #1816 )" ( #1831 )
...
This reverts commit 92aaed5cc5
2022-02-13 21:15:46 +00:00
bcf40bbf26
Lint fixes ( #1826 )
...
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-02-11 22:20:10 +00:00
92aaed5cc5
Lock Radix UI to 0.1.4 ( #1816 )
2022-02-11 19:45:53 +00:00
c5444c84fc
Migrate docs to mono repo ( #1814 )
...
* Initial commit
Created from https://vercel.com/new
* Update config
* Homepage
* Self-hosting
* Integrations
* More docs pages
* Developer docs
* Update billing.mdx
* Update install.mdx
* Fix install guide
* More fixes
* Adding CSS guide
* Fix capitalisation on Microsoft page
* Added delete account update
* Added Zapier integration question
* Added GMeet integration part
* Added Delete Account to Settings
* unnecessary question mark
* Added a link to Settings
* Added stuff in Billing
* Added a link to cal.com/signup
* Capitalization
* Added language change
* Added more stuff in Event Types
* Added how to change email
* Added FAQ page
* Spelling mistake
* Added a title to FAQ
* Added more stuff to Billing
* Availability multi-booking
* Deleted from Availability added to FAQ
* Added to FAQ
* Removed the dot
* Added stuff to FAQ
* Add license warning to adding CSS page
* Update docker.mdx
* Add import instructions
* removed readme until we have our own
* updated favicon, added cal sans
* added new cal sans
* Create README.md
* renamed all github links
* renamed more github links
* Added team's Event Types
* Clarified the Google Meet integration
* Spelling error
* Added primary calendar tutorial
* Removed tutorial
* primary calendar selection
* Moved to subdirectory
* Matching configs
* Shares eslint config between web and docs
* Removes format-schemas
* Updates env file location in turbo
* [docs] updates monorepo intructions
Co-authored-by: baileypumfleet <pumfleet@hey.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: milospuac <97884287+milospuac@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@richelsen.net>
2022-02-11 12:33:35 -07:00
5f627ad963
Update all Yarn dependencies (2022-02-11) ( #1385 )
...
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
2022-02-11 10:54:35 +00:00
e37ba3325b
Update superjson to version 1.8.1 ( #1794 )
...
Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-02-11 10:44:39 +00:00
8d3f0bf38e
Renames calendso to web ( #1795 )
2022-02-10 16:11:40 -07:00
0e43766b9c
Test fixes
2022-02-10 14:22:45 -07:00
1abb5f1ea5
Config updates
2022-02-10 14:22:45 -07:00
038e8a4b7d
Runs prettier
2022-02-10 14:22:45 -07:00
c9b1f52382
Init turborepo
2022-02-10 14:22:45 -07:00
0bc511a886
Migrated cal.com to apps/web
2022-02-10 14:22:45 -07:00
zomars