Skip to content

Commit ba7ee1a

Browse files
committed
Merge branch 'yed/sql-bump' into double-click
2 parents 86d5781 + 3e4153c commit ba7ee1a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+1192
-469
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ body:
88
value: |
99
*Please add an appropriate title for this issue.*
1010
11-
Before reporting, read the [documentation](https://github.com/TagStudioDev/TagStudio/blob/main/doc/index.md) and search existing [issues](https://github.com/TagStudioDev/TagStudio/issues).
11+
Before reporting, read the [documentation](https://github.com/TagStudioDev/TagStudio/blob/main/docs/index.md) and search existing [issues](https://github.com/TagStudioDev/TagStudio/issues).
1212
Validate that you are using an up-to-date version[^1], your issue might already be fixed!
1313
Questions, guidance, and usage goes in [discussions](https://github.com/TagStudioDev/TagStudio/discussions). Invalid issues will be closed.
1414
@@ -20,7 +20,7 @@ body:
2020
options:
2121
- label: I am using an up-to-date version.
2222
required: true
23-
- label: I have read the [documentation](https://github.com/TagStudioDev/TagStudio/blob/main/doc/index.md).
23+
- label: I have read the [documentation](https://github.com/TagStudioDev/TagStudio/blob/main/docs/index.md).
2424
required: true
2525
- label: I have searched existing [issues](https://github.com/TagStudioDev/TagStudio/issues).
2626
required: true

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ body:
88
value: |
99
*Please add an appropriate title for this feature request.*
1010
11-
Before suggesting, read the [documentation](https://github.com/TagStudioDev/TagStudio/blob/main/doc/index.md) and search existing [issues](https://github.com/TagStudioDev/TagStudio/issues).
11+
Before suggesting, read the [documentation](https://github.com/TagStudioDev/TagStudio/blob/main/docs/index.md) and search existing [issues](https://github.com/TagStudioDev/TagStudio/issues).
1212
Validate that you are using an up-to-date version[^1], your feature might already be implemented!
1313
Questions, guidance, and usage goes in [discussions](https://github.com/TagStudioDev/TagStudio/discussions). Invalid issues will be closed.
1414
@@ -20,7 +20,7 @@ body:
2020
options:
2121
- label: I am using an up-to-date version.
2222
required: true
23-
- label: I have read the [documentation](https://github.com/TagStudioDev/TagStudio/blob/main/doc/index.md).
23+
- label: I have read the [documentation](https://github.com/TagStudioDev/TagStudio/blob/main/docs/index.md).
2424
required: true
2525
- label: I have searched existing [issues](https://github.com/TagStudioDev/TagStudio/issues).
2626
required: true

.github/workflows/publish_docs.yaml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Publish Docs
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
paths:
8+
- 'docs/**'
9+
- 'mkdocs.yml'
10+
- 'CHANGELOG.md'
11+
- '.github/workflows/publish_docs.yaml'
12+
13+
permissions:
14+
contents: write
15+
16+
concurrency:
17+
group: publish-docs
18+
cancel-in-progress: true
19+
20+
jobs:
21+
deploy:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- uses: actions/checkout@v4
25+
- uses: actions/setup-python@v5
26+
with:
27+
python-version: 3.x
28+
- run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
29+
- uses: actions/cache@v4
30+
with:
31+
key: mkdocs-material-${{ env.cache_id }}
32+
path: .cache
33+
restore-keys: |
34+
mkdocs-material-
35+
- run: pip install mkdocs-material mkdocs-material[imaging]
36+
- run: mkdocs gh-deploy --force
37+
38+

.github/workflows/ruff.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
- uses: actions/checkout@v4
88
- uses: chartboost/ruff-action@v1
99
with:
10-
version: 0.6.3
10+
version: 0.6.4
1111
args: 'format --check'
1212

1313
ruff-check:
@@ -16,5 +16,5 @@ jobs:
1616
- uses: actions/checkout@v4
1717
- uses: chartboost/ruff-action@v1
1818
with:
19-
version: 0.6.3
19+
version: 0.6.4
2020
args: 'check'

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
33
# Ruff version.
4-
rev: v0.6.3
4+
rev: v0.6.4
55
hooks:
66
- id: ruff-format
77
- id: ruff

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ Thank you so much for showing interest in contributing to TagStudio! Here are a
66

77
## Getting Started
88

9-
- Check the [Planned Features](https://github.com/TagStudioDev/TagStudio/blob/main/doc/updates/planned_features.md) page, [FAQ](/README.md/#faq), as well as the open [Issues](https://github.com/TagStudioDev/TagStudio/issues) and [Pull Requests](https://github.com/TagStudioDev/TagStudio/pulls).
9+
- Check the [Planned Features](https://github.com/TagStudioDev/TagStudio/blob/main/docs/updates/planned_features.md) page, [FAQ](/README.md/#faq), as well as the open [Issues](https://github.com/TagStudioDev/TagStudio/issues) and [Pull Requests](https://github.com/TagStudioDev/TagStudio/pulls).
1010
- If you'd like to add a feature that isn't on the roadmap or doesn't have an open issue, **PLEASE create a feature request** issue for it discussing your intentions so any feedback or important information can be given by the team first.
1111
- We don't want you wasting time developing a feature or making a change that can't/won't be added for any reason ranging from pre-existing refactors to design philosophy differences.
1212

1313
### Contribution Checklist
1414

15-
- I've read the [Planned Features](https://github.com/TagStudioDev/TagStudio/blob/main/doc/updates/planned_features.md) page
15+
- I've read the [Planned Features](https://github.com/TagStudioDev/TagStudio/blob/main/docs/updates/planned_features.md) page
1616
- I've read the [FAQ](/README.md/#faq), including the "[Features I Likely Won't Add/Pull](/README.md/#features-i-likely-wont-addpull)" section
1717
- I've checked the open [Issues](https://github.com/TagStudioDev/TagStudio/issues) and [Pull Requests](https://github.com/TagStudioDev/TagStudio/pulls)
1818
- **I've created a new issue for my feature _before_ starting work on it**, or have at least notified others in the relevant existing issue(s) of my intention to work on it
@@ -86,7 +86,7 @@ A Python linter and code formatter. Ruff uses the `pyproject.toml` as its config
8686

8787
#### Running Locally
8888

89-
- Lint code with by moving into the `/tagstudio` directory with `cd tagstudio` and running `ruff --config ../pyproject.toml`.
89+
- Lint code by moving into the `/tagstudio` directory with `cd tagstudio` and running `ruff --config ../pyproject.toml`.
9090
- Format code with `ruff format` inside the repository directory
9191

9292
Ruff is also available as a VS Code [extension](https://marketplace.visualstudio.com/items?itemName=charliermarsh.ruff), PyCharm [plugin](https://plugins.jetbrains.com/plugin/20574-ruff), and [more](https://docs.astral.sh/ruff/integrations/).

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# TagStudio (Alpha): A User-Focused Document Management System
22

33
<p align="center">
4-
<img width="60%" src="github_header.png">
4+
<img width="60%" src="docs/assets/github_header.png">
55
</p>
66

77
> [!CAUTION]
@@ -11,7 +11,7 @@
1111
TagStudio is a photo & file organization application with an underlying system that focuses on giving freedom and flexibility to the user. No proprietary programs or formats, no sea of sidecar files, and no complete upheaval of your filesystem structure.
1212

1313
<figure align="center">
14-
<img width="80%" src="screenshot.jpg" alt="TagStudio Screenshot" align="center">
14+
<img width="80%" src="docs/assets/screenshot.jpg" alt="TagStudio Screenshot" align="center">
1515

1616
<figcaption><i>TagStudio Alpha v9.1.0 running on Windows 10.</i></figcaption>
1717
</figure>
@@ -53,7 +53,7 @@ TagStudio is a photo & file organization application with an underlying system t
5353
- Special search conditions for entries that are: `untagged`/`no tags` and `empty`/`no fields`.
5454

5555
> [!NOTE]
56-
> For more information on the project itself, please see the [FAQ](#faq) section as well as the [documentation](/doc/index.md).
56+
> For more information on the project itself, please see the [FAQ](#faq) section as well as the [documentation](/docs/index.md).
5757
5858
## Contributing
5959

@@ -178,7 +178,7 @@ As of writing (Alpha v9.3.0) the project is in a useable state, however it lacks
178178
### What Features Are You Planning on Adding?
179179

180180
> [!IMPORTANT]
181-
> See the [Planned Features](/doc/updates/planned_features.md) documentation for the latest feature lists. The lists here are currently being migrated over there with individual pages for larger features.
181+
> See the [Planned Features](/docs/updates/planned_features.md) documentation for the latest feature lists. The lists here are currently being migrated over there with individual pages for larger features.
182182
183183
Of the several features I have planned for the project, these are broken up into “priority” features and “future” features. Priority features were originally intended for the first public release, however are currently absent from the Alpha v9.x.x builds.
184184

doc/index.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

doc/library/library.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

doc/library/tag_categories.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)