Skip to content

Commit

Permalink
Merge branch 'main' into production
Browse files Browse the repository at this point in the history
  • Loading branch information
Natsume-197 committed Sep 9, 2024
2 parents d7a9027 + e435ecd commit ca6f356
Show file tree
Hide file tree
Showing 88 changed files with 343 additions and 17,287 deletions.
15 changes: 15 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: BrigadaSOS
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
polar: # Replace with a single Polar username
buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
thanks_dev: # Replace with a single thanks.dev username
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
2 changes: 1 addition & 1 deletion backend/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ services:
- elasticsearch

pgsync:
image: natsume197/pgsync:3.1.0
image: natsume197/pgsync:3.2.1
networks:
- nadedb-network
depends_on:
Expand Down
9 changes: 7 additions & 2 deletions extension/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion extension/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"dependencies": {
"nadedb-export-tool": "file:",
"vue": "^3.3.4",
"vue-router": "^4.2.5"
},
Expand Down Expand Up @@ -61,5 +62,5 @@
"preview": "vite preview"
},
"type": "module",
"version": "1.0.0"
"version": "1.0.2"
}
1 change: 0 additions & 1 deletion frontend/.env.example

This file was deleted.

14 changes: 0 additions & 14 deletions frontend/.eslintrc.cjs

This file was deleted.

30 changes: 0 additions & 30 deletions frontend/.gitignore

This file was deleted.

8 changes: 0 additions & 8 deletions frontend/.prettierrc.json

This file was deleted.

3 changes: 0 additions & 3 deletions frontend/.vscode/extensions.json

This file was deleted.

Loading

0 comments on commit ca6f356

Please sign in to comment.