Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	configs/app.json
  • Loading branch information
anhnguyenbitmark committed Oct 16, 2024
2 parents 3d6e38a + 3160f97 commit 91188f7
Show file tree
Hide file tree
Showing 7 changed files with 511 additions and 4 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/cloudflare-pages-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Deploy Remote Configs

on:
workflow_dispatch:
inputs:
environment:
description: 'Deployment Environment'
required: true
default: 'Production'
type: choice
options:
- Production
- Development

jobs:
deploy:
runs-on: ubuntu-latest
name: Deploy
environment: ${{ github.event.inputs.environment }}
steps:
- name: Checkout configs folder
uses: actions/checkout@v4
with:
sparse-checkout: |
configs
sparse-checkout-cone-mode: false

- name: Create version.json
run: |
echo "{\"commit\": \"${{ github.sha }}\", \"environment\": \"${{ github.event.inputs.environment }}\"}" > configs/version.json
- name: Deploy to Cloudflare Pages
uses: cloudflare/wrangler-action@v3
with:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ vars.CLOUDFLARE_ACCOUNT_ID }}
command: pages deploy configs --project-name=${{ vars.CLOUDFLARE_PROJECT_NAME }}
2 changes: 1 addition & 1 deletion agreements/ff-collector-rights/en_US.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ Feral File protects artists by forefronting their rights, just like we forefront
Your rights are guaranteed in perpetuity until you resell or transfer ownership of the work.

---
*You can review the full terms and conditions of your rights in the [Art Transfer Agreement](https://feralfile.com/legal/art-transfer-agreement) and [Terms for Artists and Collectors](https://feralfile.com/legal/terms-of-artist-collector).*
*You can review the full terms and conditions of your rights in the [Art Transfer Agreement](https://feralfile.com/legal/art-transfer-agreement) and [Terms for Artists and Collectors](https://feralfile.com/legal/terms-artists-and-collectors).*
2 changes: 1 addition & 1 deletion agreements/ff-tos/en_US.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

**Last Updated: 20-SEP 2024**

This Agreement is between you and Bitmark Inc. (“we” “us” “our” “Feral File”) and sets forth the terms and conditions that apply to your access and use of the Feral File website and service located at the [https://feralfile.com](https://feralfile.com) domain and subdomains (the "Website"). Please note that this Agreement only applies to this Website and does not apply to the use of Feral File’s blockchain digital property registry and lever system for the offer of artwork for sale or the purchase of artwork. Agreements specific to those activities are listed [here](https://feralfile.com/legal/terms-of-artist-collector).
This Agreement is between you and Bitmark Inc. (“we” “us” “our” “Feral File”) and sets forth the terms and conditions that apply to your access and use of the Feral File website and service located at the [https://feralfile.com](https://feralfile.com) domain and subdomains (the "Website"). Please note that this Agreement only applies to this Website and does not apply to the use of Feral File’s blockchain digital property registry and lever system for the offer of artwork for sale or the purchase of artwork. Agreements specific to those activities are listed [here](https://feralfile.com/legal/terms-artists-and-collectors).

## 1\. Accepting the Terms

Expand Down
22 changes: 22 additions & 0 deletions app/release_notes/production/changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,25 @@
[#] 0.53.14 - Sep 26, 2024

- We changed the Daily to show at 6AM local time.
- We’ve fixed the issue where some users were getting stuck on the loading screen when opening the app. We apologize for any inconvenience this may have caused—thanks for your patience!

[#] 0.53.10 - Sep 15, 2024

- Added Japanese support
- Improved startup performance


[#] 0.53.07 - Sep 2, 2024

Welcome to Feral File Membership.

Moving forward, all members have access to a new feature called the Feral File Daily.

As a curated feature, the Daily lets you display one new artwork every day. It works on any compatible smart TV.

Over our six-year existence, we’ve compiled an incredible exhibition history which now includes 15,000+ unique artworks. The Daily will draw from this archive, while also spotlighting artworks from recently-launched exhibitions.


[#] 0.47.0 - Jan 12, 2024

### Autonomy renamed Feral File to includes all the same features plus news ways to organize, explore, and stream digital art.
Expand Down
4 changes: 2 additions & 2 deletions app/versions.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"productionIOS": {
"requiredVersion": "0.53.11",
"requiredVersion": "0.53.17",
"link": "https://apps.apple.com/us/app/autonomy-app/id1544022728"
},
"devIOS": {
"requiredVersion": "0.50.0",
"link": "https://install.appcenter.ms/orgs/support-zzd0-28/apps/autonomy-1/distribution_groups/testers"
},
"productionAndroid": {
"requiredVersion": "0.53.10",
"requiredVersion": "0.53.14",
"link": "https://play.google.com/store/apps/details?id=com.bitmark.autonomy_client"
},
"devAndroid": {
Expand Down
Loading

0 comments on commit 91188f7

Please sign in to comment.