Prad Nukala and GitHub
31bcc21c35
feature/1121 implement ucan validation ( #1176 )
...
- **refactor: remove unused auth components**
- **refactor: improve devbox configuration and deployment process**
- **refactor: improve devnet and testnet setup**
- **fix: update templ version to v0.2.778**
- **refactor: rename pkl/net.matrix to pkl/matrix.net**
- **refactor: migrate webapp components to nebula**
- **refactor: protobuf types**
- **chore: update dependencies for improved security and stability**
- **feat: implement landing page and vault gateway servers**
- **refactor: Migrate data models to new module structure and update
related files**
- **feature/1121-implement-ucan-validation**
- **refactor: Replace hardcoded constants with model types in attns.go**
- **feature/1121-implement-ucan-validation**
- **chore: add origin Host struct and update main function to handle
multiple hosts**
- **build: remove unused static files from dwn module**
- **build: remove unused static files from dwn module**
- **refactor: Move DWN models to common package**
- **refactor: move models to pkg/common**
- **refactor: move vault web app assets to embed module**
- **refactor: update session middleware import path**
- **chore: configure port labels and auto-forwarding behavior**
- **feat: enhance devcontainer configuration**
- **feat: Add UCAN middleware for Echo with flexible token validation**
- **feat: add JWT middleware for UCAN authentication**
- **refactor: update package URI and versioning in PklProject files**
- **fix: correct sonr.pkl import path**
- **refactor: move JWT related code to auth package**
- **feat: introduce vault configuration retrieval and management**
- **refactor: Move vault components to gateway module and update file
paths**
- **refactor: remove Dexie and SQLite database implementations**
- **feat: enhance frontend with PWA features and WASM integration**
- **feat: add Devbox features and streamline Dockerfile**
- **chore: update dependencies to include TigerBeetle**
- **chore(deps): update go version to 1.23**
- **feat: enhance devnet setup with PATH environment variable and
updated PWA manifest**
- **fix: upgrade tigerbeetle-go dependency and remove indirect
dependency**
- **feat: add PostgreSQL support to devnet and testnet deployments**
- **refactor: rename keyshare cookie to token cookie**
- **feat: upgrade Go version to 1.23.3 and update dependencies**
- **refactor: update devnet and testnet configurations**
- **feat: add IPFS configuration for devnet**
- **I'll help you update the ipfs.config.pkl to include all the peers
from the shell script. Here's the updated configuration:**
- **refactor: move mpc package to crypto directory**
- **feat: add BIP32 support for various cryptocurrencies**
- **feat: enhance ATN.pkl with additional capabilities**
- **refactor: simplify smart account and vault attenuation creation**
- **feat: add new capabilities to the Attenuation type**
- **refactor: Rename MPC files for clarity and consistency**
- **feat: add DIDKey support for cryptographic operations**
- **feat: add devnet and testnet deployment configurations**
- **fix: correct key derivation in bip32 package**
- **refactor: rename crypto/bip32 package to crypto/accaddr**
- **fix: remove duplicate indirect dependency**
- **refactor: move vault package to root directory**
- **refactor: update routes for gateway and vault**
- **refactor: remove obsolete web configuration file**
- **refactor: remove unused TigerBeetle imports and update host
configuration**
- **refactor: adjust styles directory path**
- **feat: add broadcastTx and simulateTx functions to gateway**
- **feat: add PinVault handler**
2024-12-02 14:27:18 -05:00
Prad Nukala
2a128af227
Merge branch 'feature/1149-vault-allocation-error' into develop
2024-11-27 19:37:41 -05:00
Prad Nukala
9df339e500
refactor: rename layout component to root
2024-11-27 18:31:52 -05:00
Prad Nukala
09e4d4d452
feat: add new button components and layout improvements
2024-11-27 18:24:14 -05:00
Prad Nukala
74d8d516b3
refactor: refactor authentication pages into their own modules
2024-11-27 13:37:07 -05:00
Prad Nukala and GitHub
44027b9303
feature/1149 vault allocation error ( #1173 )
...
- **refactor: update devbox configuration and scripts**
- **refactor: remove web documentation**
- **refactor: move resolver formatter to services package**
- **refactor: Rename x/vault -> x/dwn and x/service -> x/svc**
- **refactor: remove unused dependencies and simplify module imports**
- **refactor: remove dependency on DWN.pkl**
- **refactor: Move IPFS interaction functions to common package**
- **refactor: remove unused TUI components**
- **feat: add gum package and update devbox configuration**
- **refactor: rename Assertion to Account and update related code**
- **fix: resolve rendering issue in login modal**
- **refactor: migrate build system from Taskfile to Makefile**
- **refactor: Deployment setup**
- **refactor: Update Credential table to match WebAuthn Credential
Descriptor**
- **feat: add fast reflection methods for Capability and Resource**
- **fix: update devbox lockfile**
- **feat: add support for parent field and resources list in Capability
message**
- **feature/1149-vault-allocation-error**
- **fix: adjust fullscreen modal close button margin**
2024-11-26 22:05:50 -05:00
Prad Nukala
2362d2365d
fix: adjust fullscreen modal close button margin
2024-11-26 21:48:31 -05:00
Prad Nukala
155ff42958
feature/1149-vault-allocation-error
2024-11-26 21:23:14 -05:00
Prad Nukala
f89260bacd
feat: add support for parent field and resources list in Capability message
2024-11-26 20:51:58 -05:00
Prad Nukala
93770d481a
fix: update devbox lockfile
2024-11-26 17:09:07 -05:00
Prad Nukala
4a8a15e4d6
feat: add fast reflection methods for Capability and Resource
2024-11-26 13:23:44 -05:00
Prad Nukala (aider)
7a8707e5d0
refactor: Update Credential table to match WebAuthn Credential Descriptor
2024-11-26 13:13:53 -05:00
Prad Nukala
e89bbb05b1
refactor: Deployment setup
2024-11-26 11:44:17 -05:00
Prad Nukala
b9b868d55a
refactor: migrate build system from Taskfile to Makefile
2024-11-26 10:54:32 -05:00
Prad Nukala
50217d169d
fix: resolve rendering issue in login modal
2024-11-26 00:09:37 -05:00
Prad Nukala
179a69df1c
refactor: rename Assertion to Account and update related code
2024-11-26 00:07:45 -05:00
Prad Nukala
9e7f70c455
feat: add gum package and update devbox configuration
2024-11-25 16:27:03 -05:00
Prad Nukala
e4c21e8552
refactor: remove unused TUI components
2024-11-25 16:03:29 -05:00
Prad Nukala
6a761c05e6
refactor: Move IPFS interaction functions to common package
2024-11-25 15:56:54 -05:00
Prad Nukala
d9815cc96c
refactor: remove dependency on DWN.pkl
2024-11-25 15:54:05 -05:00
Prad Nukala
0e14099f0c
refactor: remove unused dependencies and simplify module imports
2024-11-25 15:47:21 -05:00
Prad Nukala
629ef72954
refactor: Rename x/vault -> x/dwn and x/service -> x/svc
2024-11-25 15:44:55 -05:00
Prad Nukala
711acd6bb8
refactor: move resolver formatter to services package
2024-11-25 15:17:19 -05:00
Prad Nukala
4cbada21a7
refactor: remove web documentation
2024-11-25 15:13:16 -05:00
Prad Nukala
e04d071ca7
refactor: update devbox configuration and scripts
2024-11-25 13:54:33 -05:00
Prad Nukala
1568844255
refactor: update templ version to v0.2.778 and remove unused air config
2024-11-23 16:32:15 -05:00
Prad Nukala and GitHub
89989fa102
feature/1114 implement account interface ( #1167 )
...
- **refactor: move session-related code to middleware package**
- **refactor: update PKL build process and adjust related
configurations**
- **feat: integrate base.cosmos.v1 Genesis module**
- **refactor: pass session context to modal rendering functions**
- **refactor: move nebula package to app directory and update templ
version**
- **refactor: Move home section video view to dedicated directory**
- **refactor: remove unused views file**
- **refactor: move styles and UI components to global scope**
- **refactor: Rename images.go to cdn.go**
- **feat: Add Empty State Illustrations**
- **refactor: Consolidate Vault Index Logic**
- **fix: References to App.wasm and remove Vault Directory embedded CDN
files**
- **refactor: Move CDN types to Models**
- **fix: Correct line numbers in templ error messages for
arch_templ.go**
- **refactor: use common types for peer roles**
- **refactor: move common types and ORM to a shared package**
- **fix: Config import dwn**
- **refactor: move nebula directory to app**
- **feat: Rebuild nebula**
- **fix: correct file paths in panels templates**
- **feat: Remove duplicate types**
- **refactor: Move dwn to pkg/core**
- **refactor: Binary Structure**
- **feat: Introduce Crypto Pkg**
- **fix: Broken Process Start**
- **feat: Update pkg/* structure**
- **feat: Refactor PKL Structure**
- **build: update pkl build process**
- **chore: Remove Empty Files**
- **refactor: remove unused macaroon package**
- **feat: Add WebAwesome Components**
- **refactor: consolidate build and generation tasks into a single
taskfile, remove redundant makefile targets**
- **refactor: refactor server and move components to pkg/core/dwn**
- **build: update go modules**
- **refactor: move gateway logic into dedicated hway command**
- **feat: Add KSS (Krawczyk-Song-Song) MPC cryptography module**
- **feat: Implement MPC-based JWT signing and UCAN token generation**
- **feat: add support for MPC-based JWT signing**
- **feat: Implement MPC-based UCAN capabilities for smart accounts**
- **feat: add address field to keyshareSource**
- **feat: Add comprehensive MPC test suite for keyshares, UCAN tokens,
and token attenuations**
- **refactor: improve MPC keyshare management and signing process**
- **feat: enhance MPC capability hierarchy documentation**
- **refactor: rename GenerateKeyshares function to NewKeyshareSource for
clarity**
- **refactor: remove unused Ethereum address computation**
- **feat: Add HasHandle and IsAuthenticated methods to HTTPContext**
- **refactor: Add context.Context support to session HTTPContext**
- **refactor: Resolve context interface conflicts in HTTPContext**
- **feat: Add session ID context key and helper functions**
- **feat: Update WebApp Page Rendering**
- **refactor: Simplify context management by using single HTTPContext
key**
- **refactor: Simplify HTTPContext creation and context management in
session middleware**
- **refactor: refactor session middleware to use a single data
structure**
- **refactor: Simplify HTTPContext implementation and session data
handling**
- **refactor: Improve session context handling and prevent nil pointer
errors**
- **refactor: Improve session context handling with nil safety and type
support**
- **refactor: improve session data injection**
- **feat: add full-screen modal component and update registration flow**
- **chore: add .air.toml to .gitignore**
- **feat: add Air to devbox and update dependencies**
2024-11-23 01:28:58 -05:00
Prad Nukala and GitHub
bf94277b0f
feature/1110 abstract connected wallet operations ( #1166 )
...
- **refactor: refactor DID module types and move to controller package**
- **refactor: move controller creation and resolution logic to keeper**
- **refactor: update imports to reflect controller package move**
- **refactor: update protobuf definitions for DID module**
- **docs: update proto README to reflect changes**
- **refactor: move hway to gateway, update node modules, and refactor
pkl generation**
- **build: update pkl-gen task to use new pkl file paths**
- **refactor: refactor DWN WASM build and deployment process**
- **refactor: refactor DID controller implementation to use
account-based storage**
- **refactor: move DID controller interface to base file and update
implementation**
- **chore: migrate to google protobuf**
- **feat: Add v0.52.0 Interfaces for Acc Abstraction**
- **refactor: replace public_key with public_key_hex in Assertion
message**
- **refactor: remove unused PubKey, JSONWebKey, and RawKey message types
and related code**
2024-11-18 19:04:10 -05:00
Prad Nukala
01cb37e82e
refactor: move signer implementation to mpc package
2024-11-18 11:06:00 -05:00
Prad Nukala and GitHub
d8cb2cbbf6
feature/1126 implement pkl config ( #1161 )
...
- **refactor: move marketing pages to**
- **feat: add role select input**
2024-11-06 13:32:51 -05:00
Prad Nukala
9372db6279
feat: add remote client constructor
2024-11-05 09:43:10 -05:00
Prad Nukala
e76c4a5902
refactor: update marketing section architecture
2024-11-05 08:14:26 -05:00
Prad Nukala
075b54883b
fix: update file paths in error messages
2024-11-04 13:45:28 -05:00
Prad Nukala
99861266c6
refactor: change verification table id
2024-11-04 13:38:58 -05:00
Prad Nukala
006f69e0d2
feat: add avatar image components
2024-11-04 10:42:35 -05:00
Prad Nukala
de4d62e63e
feat: add SVG CDN Illustrations to marketing architecture
2024-11-04 10:08:06 -05:00
Prad Nukala
dd272bf194
<no value>
2024-11-01 14:42:56 -04:00
Prad Nukala
388ca462a4
refactor(proto): remove macaroon proto
2024-11-01 14:42:08 -04:00
Prad Nukala
5b85868993
refactor: rename ValidateBasic to Validate
2024-10-30 13:44:50 -04:00
Prad Nukala
f70fa75e86
docs: update README with dependencies and state info
2024-10-30 09:58:47 -04:00
Prad Nukala
bbfd3e5171
docs: add caveat description
2024-10-28 10:12:05 -04:00
Prad Nukala
b1422bc97e
refactor: rename session cookie key
2024-10-24 16:18:27 -04:00
Prad Nukala
f14f6ff536
docs(marketing): improve section data model and section rendering
2024-10-24 16:11:30 -04:00
Prad Nukala
c8657022a2
feat(marketing): refactor marketing page components
2024-10-24 10:31:40 -04:00
Prad Nukala (aider)
7b5ee7b0ed
feat: Refactor intro video component to use a proper script template
2024-10-23 12:51:49 -04:00
Prad Nukala
bda52d5f3d
fix: update intro video modal script
2024-10-23 12:51:48 -04:00
Prad Nukala (aider)
137f0ed7f3
feat: Move Alpine.js script initialization to separate component
2024-10-23 12:50:38 -04:00
Prad Nukala
cf839c9491
feat: Add intro video modal component
2024-10-23 12:50:37 -04:00
Prad Nukala
0d12487c65
feat: add homepage architecture section
2024-10-23 12:26:01 -04:00
Prad Nukala
dc20befb86
feat: add Hero section component with stats and buttons
2024-10-23 11:37:11 -04:00
Prad Nukala
6c6b38a2e3
feat(css): add new utility classes for group hover
2024-10-23 11:36:59 -04:00
Prad Nukala
1ca706744e
Merge branch 'feature/1119-allocate-vault-macaroon' into feature/1149-fix-vault-allocation
2024-10-23 10:08:55 -04:00
Prad Nukala
5e6fc4a82b
Merge branch 'feature/1126-implement-pkl-config' into feature/1149-fix-vault-allocation
2024-10-23 10:08:54 -04:00
Prad Nukala
7cbc9e0bb1
feat: implement authentication register finish endpoint
2024-10-23 09:52:07 -04:00
Prad Nukala
1ae8a8675e
Merge branch 'feature/1119-allocate-vault-macaroon' into feature/1110-implement-dwn-wallet-abstraction
2024-10-21 17:02:36 -04:00
Prad Nukala
d3f5e613ea
Merge branch 'feature/1119-allocate-vault-macaroon' into feature/1126-implement-pkl-config
2024-10-21 17:02:31 -04:00
Prad Nukala (aider)
2479bae12e
feat: Update service module README based on protobuf files
2024-10-21 17:02:12 -04:00
Prad Nukala (aider)
fd62b6ec67
feat: Update x/macaroon/README.md with details from protobuf files
2024-10-21 17:00:59 -04:00
Prad Nukala (aider)
348555981b
docs: update DID Modules Readme files
2024-10-21 16:59:29 -04:00
Prad Nukala (aider)
6faf2e172b
feat: update Vault README with details from proto files
2024-10-21 16:57:35 -04:00
Prad Nukala
54953ccb4b
refactor: remove formatter.go from service module
2024-10-21 16:22:35 -04:00
Prad Nukala
f84773f1f8
refactor: remove unused sync-initial endpoint
2024-10-21 13:15:02 -04:00
Prad Nukala
603da5560f
feat: add controller creation step to allocate
2024-10-21 13:07:38 -04:00
Prad Nukala
10f5bfef67
fix: include assets generation in wasm build
2024-10-21 13:01:51 -04:00
Prad Nukala
937b65ae95
Merge branch 'feature/1110-implement-dwn-wallet-abstraction' into develop
2024-10-21 12:32:10 -04:00
Prad Nukala
39ce73284e
chore: upgrade go version to 1.23 in version-bump workflow
2024-10-21 12:32:04 -04:00
Prad Nukala
59f59311b4
Merge branch 'feature/1126-implement-pkl-config' into feature/1110-implement-dwn-wallet-abstraction
2024-10-21 12:25:45 -04:00
Prad Nukala
2c02712b1b
chore(deps): update globalfee, poa and tokenfactory to v0.50.0
2024-10-21 12:25:38 -04:00
Prad Nukala
8239bd3fbd
Merge branch 'feature/1126-implement-pkl-config' into feature/1110-implement-dwn-wallet-abstraction
2024-10-21 12:16:38 -04:00
Prad Nukala
29c0393f98
docs: remove dash from wiki link titles
2024-10-21 12:16:35 -04:00
Prad Nukala
14aa60891c
Merge branch 'feature/1126-implement-pkl-config' into feature/1110-implement-dwn-wallet-abstraction
2024-10-21 12:13:43 -04:00
Prad Nukala
0c0a673fa9
Merge branch 'develop' into feature/1126-implement-pkl-config
2024-10-21 12:11:23 -04:00
Prad Nukala
6ca0dc7dfc
Merge branch 'develop' into feature/1110-implement-dwn-wallet-abstraction
2024-10-21 12:11:20 -04:00
Prad Nukala
91ee1e5c8b
docs: add documentation links to README
2024-10-21 12:11:03 -04:00
Prad Nukala
94f98d8e44
docs: update stats section in README
2024-10-21 12:07:49 -04:00
Prad Nukala
8c44be5122
docs: remove extraneous center tags from README
2024-10-21 12:07:19 -04:00
Prad Nukala
2e7729ce84
Merge branch 'develop' into feature/1110-implement-dwn-wallet-abstraction
2024-10-21 12:05:47 -04:00
Prad Nukala
b9d83b18e3
refactor: remove StakingKeeper dependency from GlobalFeeDecorator
2024-10-21 12:04:36 -04:00
Prad Nukala
6c39e1a2ab
Merge branch 'develop' into feature/1110-implement-dwn-wallet-abstraction
2024-10-21 12:03:36 -04:00
Prad Nukala
dd84d3fcb3
Merge branch 'master' into develop
2024-10-21 12:03:25 -04:00
Prad Nukala
a9caac47d7
Merge branch 'develop' into feature/1110-implement-dwn-wallet-abstraction
2024-10-21 11:31:28 -04:00
Prad Nukala and GitHub
311b957550
feature/1118 formatter interface creation ( #1147 )
...
- **refactor: improve query service code structure**
- **chore(deps): update protoc-gen-go-grpc to v1.5.1**
- **refactor: replace package with**
- **chore(deps): update dependencies**
- **fix(deps): update webauthn to v0.11.2**
- **refactor: remove onsonr.sonr from package names**
- **refactor: improve code readability in vault querier**
- **refactor: simplify controller initialization**
- **fix: remove unnecessary function for counter data**
- **refactor: update button component file paths**
- **refactor(authentication): simplify register page**
- **fix: update error filenames in marketing section templates**
2024-10-21 11:30:52 -04:00
Prad Nukala
3ad6036eb8
refactor: update gRPC client to use new request types
2024-10-18 15:10:09 -04:00
Prad Nukala
a0a5f0c7e0
refactor: use RawPublicKey instead of PublicKey in macaroon issuer
2024-10-18 14:09:16 -04:00
Prad Nukala
6da6f2b97b
feat: add custom secp256k1 pubkey
2024-10-18 13:45:57 -04:00
Prad Nukala
a7df1415d2
refactor: improve error handling in DID module
2024-10-18 13:36:29 -04:00
Prad Nukala
381a09d87e
Merge branch 'develop' into feature/1110-implement-dwn-wallet-abstraction
2024-10-18 13:18:32 -04:00
Prad Nukala
08e28b0a5f
docs: Add README for protobuf directory
2024-10-18 13:18:00 -04:00
Prad Nukala
cc6f4e6931
fix(version): revert version bump to 0.5.11
2024-10-18 13:17:04 -04:00
Prad Nukala
08c946547e
refactor: remove dependency on proto change detection
2024-10-18 13:14:48 -04:00
Prad Nukala
64297772e4
fix(version): update version to 0.5.12
2024-10-18 13:12:55 -04:00
Prad Nukala
e1ad117473
refactor: update asset publishing configuration
2024-10-18 13:08:53 -04:00
Prad Nukala and GitHub
2cd44c0b66
feature/1125 offload sync service worker ( #1144 )
...
- **feat: provide access to block time**
- **refactor: move block expiry calculation to helper function**
- **feat: register decentralized web node HTMX views**
- **feat: Reorganize methods in layout.templ file alphabetically**
- **feat: add support for layout variants**
- **feat: update Allocate RPC to use GET request with path parameters**
- **feat: add gRPC Gateway endpoint for Allocate**
- **refactor: rename SyncCurrent to Sync**
- **feat: improve code organization by making vault assembly private**
- **feat: add a new method for syncing DID documents**
2024-10-18 13:07:52 -04:00
Prad Nukala and GitHub
b6c49828ed
feature/1111 sync chain dwn endpoint ( #1143 )
...
- **feat(did): add assertion type to DID spec**
- **refactor: update build process to include assets generation**
- **refactor: update import paths for to**
- **feat: introduce new authentication state management**
- **feat: add current account route**
- **feat: implement global toasts with custom HTML**
- **refactor: remove unused session code**
- **feat: add config.json to embedded assets**
- **refactor: remove unused dependency on gorilla/sessions**
- **refactor: simplify session management and remove unnecessary
fields**
- **fix: remove unnecessary import for unused protobuf types**
- **feat: introduce separate HTTP contexts for Highway and DWN**
- **fix(keeper): Handle missing controller during initial sync**
- **refactor: extract DWN configuration from DWNContext**
- **feat: add view route**
- **fix: update configuration file name in embed.go**
- **feat: improve vaultindex page loading experience**
- **feat(hway): add highway context to echo context**
- **chore(deps): bump onsonr/crypto from 1.32.0 to 1.33.0**
- **refactor: rename DWNSessionMiddleware to WebNodeSessionMiddleware**
- **feat: rename client API to web node API**
- **refactor: separate API and view routes**
- **refactor: remove unused build targets in Makefile**
- **feat: add Devbox integration to container**
- **feat: add wasm support for dwn**
- **refactor: update module proto import**
- **feat: add default first and third party caveats**
- **feat: Add target vault allocation mechanism**
- **refactor: introduce standardized session cookie handling**
- **fix: update service worker installation and ready states**
- **feat: add worker handlers**
- **feat: Enable SSH access to devcontainer**
- **refactor: rename HighwayContext to HwayContext**
- **feat: add block expiration calculation to sonr context**
- **feat: remove config from cookie and header**
- **feat(gen): Remove generated code for IPFS, Motr and Sonr**
- **refactor: remove unused createMotrConfig function**
- **feat: add project analytics with Repobeats**
- **docs: Remove component details from README**
- **refactor: rename SetConfig to injectConfig**
2024-10-15 14:31:19 -04:00
Prad Nukala
104df074e9
feat: add User-Agent and Platform to session
2024-10-12 12:52:20 -04:00
Prad Nukala
58aa71997d
feat: introduce AuthState enum for authentication state
2024-10-11 19:03:14 -04:00
Prad Nukala and GitHub
3790e926de
feature/1109 grpc session model ( #1141 )
...
- **feat: remove Hway deployment**
- **feat: introduce session middleware for requests**
- **refactor: update path imports to use new pkg folder**
- **feat: add gRPC client for interacting with services**
- **feat: remove grpc client and use REST api**
- **refactor: move from to**
- **feat: add client views endpoint**
- **feat: add webauthn support**
- **closes: #1124**
- **refactor: Improve PR labeler configuration**
- **feat: add milestone discussion template**
- **feat: remove OKR tracking issue template**
- **feat: use gorilla sessions for session management**
- **refactor: move pubkey related code to**
- **<no value>**
- **refactor: remove unused identifier type**
- **feat: integrate Macaroon Keeper with Service Module**
- **refactor: rename worker routes for clarity**
2024-10-11 16:47:52 -04:00
Prad Nukala
4e8db8d3d4
refactor: remove unnecessary branch configuration from scheduled release workflow
2024-10-10 13:47:52 -04:00
Prad Nukala
02f161f76c
fix: Correct source directory for asset publishing
2024-10-10 13:47:31 -04:00
Prad Nukala
c17bdebffd
Merge branch 'develop'
2024-10-10 13:45:50 -04:00