Skip to content

Commit

Permalink
Merge pull request #7 from victorxtsai/Update20241021_Codespace
Browse files Browse the repository at this point in the history 
Update20241021_Codespace
  • Loading branch information
@victorxtsai
victorxtsai authored Oct 22, 2024
2 parents 224b428 + 587ba12 commit 33204b4
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 48 deletions.
40 changes: 11 additions & 29 deletions git.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,27 +113,9 @@
},
{
"cell_type": "code",
"execution_count": 16,
"execution_count": null,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"On branch Update20241021_Codespace\n",
"Your branch is up to date with 'origin/Update20241021_Codespace'.\n",
"\n",
"Changes not staged for commit:\n",
" (use \"git add <file>...\" to update what will be committed)\n",
" (use \"git restore <file>...\" to discard changes in working directory)\n",
"\t\u001b[31mmodified: git.ipynb\u001b[m\n",
"\t\u001b[31mmodified: index.html\u001b[m\n",
"\t\u001b[31mmodified: privacy.html\u001b[m\n",
"\n",
"no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
]
}
],
"outputs": [],
"source": [
"# see changes\n",
"!git status"
Expand All @@ -148,24 +130,24 @@
},
{
"cell_type": "code",
"execution_count": 15,
"execution_count": 17,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"[Update20241021_Codespace 1c0d2f8] Update20241021_Codespace\n",
" 4 files changed, 22 insertions(+), 17 deletions(-)\n",
"Enumerating objects: 11, done.\n",
"Counting objects: 100% (11/11), done.\n",
"[Update20241021_Codespace 6fda950] Update20241021_Codespace\n",
" 3 files changed, 32 insertions(+), 19 deletions(-)\n",
"Enumerating objects: 9, done.\n",
"Counting objects: 100% (9/9), done.\n",
"Delta compression using up to 2 threads\n",
"Compressing objects: 100% (6/6), done.\n",
"Writing objects: 100% (6/6), 893 bytes | 893.00 KiB/s, done.\n",
"Total 6 (delta 4), reused 0 (delta 0), pack-reused 0 (from 0)\n",
"Compressing objects: 100% (5/5), done.\n",
"Writing objects: 100% (5/5), 1.57 KiB | 1.57 MiB/s, done.\n",
"Total 5 (delta 4), reused 0 (delta 0), pack-reused 0 (from 0)\n",
"remote: Resolving deltas: 100% (4/4), completed with 4 local objects.\u001b[K\n",
"To https://github.com/victorxtsai/mindwellworld_website\n",
" 543be78..1c0d2f8 Update20241021_Codespace -> Update20241021_Codespace\n",
" 1c0d2f8..6fda950 Update20241021_Codespace -> Update20241021_Codespace\n",
"branch 'Update20241021_Codespace' set up to track 'origin/Update20241021_Codespace'.\n"
]
}
Expand Down
79 changes: 60 additions & 19 deletions privacy.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,23 +157,20 @@ <h2>Introduction</h2>

<div class="section">
<h2>1. Information We Collect</h2>
<h3>1.1. Personal Data You Provide</h3>
<h3>1.1. Information You Provide</h3>
<p>When you use our Service or communicate with us, you provide certain personal information. This may include:</p>
<ul>
<li>Account Data: When a Mindwell World account is used to access the Service, we will collect your contact information, account credentials, and other relevant information.
If you register or log into our Service using another service, that service will send your information to us.</li>
<li>Payment Data: We may collect payment information (such as payment card information) directly from you and details regarding your transactions with us.</li>
<li>Payment Data: We will collect payment and transaction information (such as payment card information) directly from you when you make a transaction with us.</li>
<li>Contact and Communications Data: If you communicate with us, we will collect contact information such as your name, email address, any other contact details you voluntarily choose to provide us, and any additional information you provide in your communications with us.</li>
<li>User Content: When you use our Service, we collect personal information that is included in user inputs to the Service (like prompts and file uploads submitted to Grok)
("Input") and outputs of the Service (like the text responses Grok generates based on the Input)("Output") (together, "User Content").
If you include personal information in Inputs you provide to the Service, this information may be reproduced in the Output.
Please do not share any personal information (including any sensitive information) in your Input to the Service.</li>
<li>Feedback Data: Where applicable, we will collect your feedback to improve our Service. </li>
<li>User Content: When you use our Service, we collect personal information that is included in user inputs to the Service (like Journal and Mood information in our Daily Reflections product).</li>
<li>Feedback Data: Where applicable, we will collect your feedback. </li>
<li>Applicant Data: If you apply for a job with us, we will collect your personal information such as your contact details, resume/CV, education and work history, and visa status.
You also may choose to provide your gender, ethnicity, veteran status, disability status, and links to your website, blog, portfolio, LinkedIn or other public profiles.</li>
</ul>

<h3>1.2. Data Automatically Provided To Us</h3>
<h3>1.2. Information Automatically Provided To Us</h3>
<p>When you use or interact with our Service, your device typically automatically provides us with certain device and usage information. This may include:</p>
<ul>
<li>Device Data: Technical information such as your IP address, device type, country from which you access, browser type and version, operating system, device features, etc...</li>
Expand All @@ -185,15 +182,49 @@ <h3>1.2. Data Automatically Provided To Us</h3>

<div class="section">
<h2>2. How We Use Your Information</h2>
<h3>2.1. To Provide and Improve Our Services</h3>
<p>We use your information to provide and maintain our services and improve the functionality of our website.</p>

<h3>2.2. To Communicate with You</h3>
<p>We may contact you regarding updates, promotions, or inquiries you have submitted.</p>
<h3>2.1. General Ways We Use Your Information</h3>
<p>To process payments for our Service: We may process payment data in relation to access to certain features of our Service, as applicable.

To provide and maintain our Service: We use your personal information to provide and maintain our Service (including to provide Output in response to Input).

To provide support and assistance in relation to our Service, including to communicate with you and respond to your enquiries: We use your personal information to troubleshoot and diagnose problems, provide customer care and support services.

To develop and improve our Service: We use your personal information for research and development purposes, to analyze trends to identify future opportunities for the development, promotion, and improvement of our Service. For example, as noted above, we may process (i) publicly available data, (ii) User Content you provide to us, and (iii) Feedback Data you volunteer, to train and improve the models that power our Service.

To ensure the security and integrity of our Service: We do this by preventing and detecting fraud, unauthorized use, and other unlawful use of our Service by verifying activity, investigating suspicious activity, and enforcing our terms and policies.

To comply with our legal obligations: We process your personal information when cooperating with public and government authorities, courts or regulators in accordance with our legal obligations under applicable laws, to the extent this requires the processing or disclosure of personal information to protect our rights, or is necessary for protecting against misuse or abuse of our Service, protecting personal property or safety, pursuing remedies available to us and limiting our damages, complying with judicial proceedings, court orders or legal processes, or to respond to lawful requests.

To process job applications: We process your personal information if you apply for a job with xAI, to evaluate your application and make hiring decisions, communicate with you and inform you of current and future career opportunities (unless you tell us that you do not want us to keep your details for such purposes), manage and improve our recruiting and hiring processes, or to conduct reference and background checks where required or permitted by applicable local law.

For our business or commercial purposes: We may use your personal information for other legitimate business purposes, such as to identify new customers, data analysis, developing new products, identifying usage trends, and operating and expanding our business activities.

We may use your personal information for reasons not described in this Privacy Policy, where permitted by law and the reason is compatible with the purpose for which we collected it. If we need to use your personal information for an unrelated purpose, we will notify you and explain the applicable legal basis..</p>
<ul>
<li>Account Data: When a Mindwell World account is used to access the Service, we will collect your contact information, account credentials, and other relevant information.
If you register or log into our Service using another service, that service will send your information to us.</li>
<li>Payment Data: We will collect payment and transaction information (such as payment card information) directly from you when you make a transaction with us.</li>
<li>Contact and Communications Data: If you communicate with us, we will collect contact information such as your name, email address, any other contact details you voluntarily choose to provide us, and any additional information you provide in your communications with us.</li>
<li>User Content: When you use our Service, we collect personal information that is included in user inputs to the Service (like Journal and Mood information in our Daily Reflections product).</li>
<li>Feedback Data: Where applicable, we will collect your feedback. </li>
<li>Applicant Data: If you apply for a job with us, we will collect your personal information such as your contact details, resume/CV, education and work history, and visa status.
You also may choose to provide your gender, ethnicity, veteran status, disability status, and links to your website, blog, portfolio, LinkedIn or other public profiles.</li>
</ul>
<h3>2.2. Data Specific Ways Information Is Used</h3>
<ul>
<li>Account Data: When a Mindwell World account is used to access the Service, we will collect your contact information, account credentials, and other relevant information.
If you register or log into our Service using another service, that service will send your information to us.</li>
<li>Payment Data: We will collect payment and transaction information (such as payment card information) directly from you when you make a transaction with us.</li>
<li>Contact and Communications Data: If you communicate with us, we will collect contact information such as your name, email address, any other contact details you voluntarily choose to provide us, and any additional information you provide in your communications with us.</li>
<li>User Content: When you use our Service, we collect personal information that is included in user inputs to the Service (like Journal and Mood information in our Daily Reflections product).</li>
<li>Feedback Data: Where applicable, we will collect your feedback. </li>
<li>Applicant Data: If you apply for a job with us, we will collect your personal information such as your contact details, resume/CV, education and work history, and visa status.
You also may choose to provide your gender, ethnicity, veteran status, disability status, and links to your website, blog, portfolio, LinkedIn or other public profiles.</li>
</ul>
</div>

<div class="section">
<h2>4. Personal Data Safety </h2>
<h2>4. Security Of Your Information</h2>
<h3>4.1. Storing Data</h3>
<p>Data such as journal entries are initially stored unencrypted on your local device.
If and when data is sent to our servers for storage, it is encrypted first before transmission. Data stays encrypted on our servers.
Expand All @@ -205,12 +236,22 @@ <h3>4.2. To Communicate with You</h3>
</div>

<div class="section">
<h2>5. Sharing Your Information</h2>
<h3>5.1. Non-User Input Data</h3>
<p>Non-User Input data includes data that we are able to collect without your input, such as .</p>
<h2>5. Sharing Of Your Information</h2>
<p>We do not share your personal information with third parties, other than as follows:

<h3>5.2. User Input Data</h3>
<p>User Input data ar.</p>
With our contracted vendors, service providers and consultants: To assist in providing the Service to you or performing business operations, we provide your personal information to vendors and service providers including providers of hosting services, cloud services, web analytics providers, content delivery services, and payment and transaction providers and other technology service providers, for the purposes described above.

In connection with business transfers: In connection with or during negotiation of any merger, financing, acquisition, bankruptcy, dissolution, transaction, or proceeding involving sale, transfer, divestiture, or disclosure of all or a portion of our business or assets to another company. If required by applicable laws, we will use reasonable efforts to notify you of any transfer of personal information to an unaffiliated third party.

To comply with our legal obligations: To (i) comply with laws or to respond to lawful requests and legal process, (ii) protect the rights and property of xAI and our agents, customers, and others, including to enforce our agreements, policies, and terms of use, or (iii) in an emergency, to protect the personal safety of xAI, its customers, or any person.

With our related companies: We may disclose personal information to our related companies to the extent such sharing is necessary to fulfill a request you have submitted via our Service or for customer management, customer support, technical operations, or the purposes described above.

We may also create and share anonymized, aggregated and de-identified usage data with our related companies and also with third parties to help us perform analysis and make improvements. Additionally, we may share anonymous usage data on an aggregate basis in the normal course of operating our business. For example, we may share information publicly to show trends in the use of our Service.

Save as expressly detailed above, we do not share, sell, or rent any of your personal information to any third party and will not do so without updating this Privacy Policy, notifying you, or, where necessary, obtaining your consent.

Please note that any personal information or other information you choose to submit in communities, forums, blogs, or chat rooms on our websites may be read, collected, and used by others who visit these forums or pages.</p>
</div>

<div class="section">
Expand Down

0 comments on commit 33204b4

Please sign in to comment.