Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #69

Merged
merged 7 commits into from
Apr 18, 2024
Merged

Dev #69

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- name: Deploy to GitHub Pages
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
uses: peaceiris/actions-gh-pages@v3
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./build/web
Expand Down
38 changes: 38 additions & 0 deletions PRIVACY_POLICY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
**MergeData Privacy Policy**

Last updated: April 17th 2024

At MergeData, we are committed to protecting your privacy and ensuring that your personal information is handled in a safe and responsible way. This policy outlines how we collect, use, and disclose personal information from users of our app.

**Information We Collect**

We collect information that you provide to us directly, such as your name, if you choose to provide it. We do not require users to provide any other personal information to use our app.

**How We Use Your Information**

We use the information we collect to:

* Provide, maintain, and improve our app
* Monitor and analyze trends, usage, and activities in connection with our app
* Carry out any other purpose for which the information was collected

**How We Share Your Information**

We do not share your personal information with third parties, except in the following circumstances:

* With your consent
* With service providers who need access to such information to carry out work on our behalf
* In response to a request for information if we believe disclosure is in accordance with any applicable law, regulation, or legal process, or as otherwise required by any applicable law, rule, or regulation
* If we believe your actions are inconsistent with our user agreements or policies, or to protect the rights, property, and safety of MergeData or others

**Data Retention**

We store the information we collect about you for as long as is necessary for the purpose(s) for which we originally collected it, or for other legitimate business purposes, including to meet our legal, regulatory, or other compliance obligations.

**Security**

We take reasonable measures to help protect information about you from loss, theft, misuse and unauthorized access, disclosure, alteration, and destruction.

**Contact Us**

If you have any questions about this privacy policy, please create an issue on Github at this link: (https://github.com/FRC2706/MergeData/issues).
8 changes: 4 additions & 4 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -332,10 +332,10 @@ packages:
dependency: "direct main"
description:
name: shared_preferences
sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
sha256: d3bbe5553a986e83980916ded2f0b435ef2e1893dfaa29d5a7a790d0eca12180
url: "https://pub.dev"
source: hosted
version: "2.2.2"
version: "2.2.3"
shared_preferences_android:
dependency: transitive
description:
Expand Down Expand Up @@ -449,10 +449,10 @@ packages:
dependency: "direct main"
description:
name: url_launcher
sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e"
sha256: "6ce1e04375be4eed30548f10a315826fd933c1e493206eab82eed01f438c8d2e"
url: "https://pub.dev"
source: hosted
version: "6.2.5"
version: "6.2.6"
url_launcher_android:
dependency: transitive
description:
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dependencies:
flutter:
sdk: flutter

url_launcher:
url_launcher: 6.2.6
flutter_svg:

# The following adds the Cupertino Icons font to your application.
Expand All @@ -40,7 +40,7 @@ dependencies:
qr_flutter: ^4.1.0
qr_code_scanner: ^1.0.1
gsheets: ^0.5.0
shared_preferences: ^2.2.2
shared_preferences: ^2.2.3

dev_dependencies:
flutter_test:
Expand Down
Loading