Skip to content

Backport 2024.7.0 to develop #333

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.

Sign up for GitHub

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

Merged
varmar05 merged 6 commits into from
Nov 19, 2024
Merged

Backport 2024.7.0 to develop #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a444246
Merge pull request #318 from MerginMaps/develop
MarcelGeo Nov 4, 2024
83cfacf
Set proper project version type in flask cmd
varmar05 Nov 13, 2024
c8a7654
Merge pull request #330 from MerginMaps/fix_download_cmd
MarcelGeo Nov 13, 2024
84141dc
fix spelling of template
MarcelGeo Nov 18, 2024
16185da
Remove pretty text wrap froom span
MarcelGeo Nov 18, 2024
cbc826a
Merge pull request #329 from MerginMaps/build-2024.7.0
MarcelGeo Nov 18, 2024
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 server/mergin/sync/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def create(name, namespace, user): # pylint: disable=W0612

@project.command()
@click.argument("project-name")
@click.option("--version", required=True)
@click.option("--version", type=int, required=True)
@click.option("--directory", type=click.Path(), required=True)
def download(project_name, version, directory): # pylint: disable=W0612
"""Download files for project at particular version"""
Expand Down
4 changes: 2 additions & 2 deletions web-app/packages/admin-lib/src/modules/admin/components/AdminProjectsTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
:sortable="header.sortable"
>
<template #body="slotProps">
<templte v-if="slotProps.data.removed_at">{{
<template v-if="slotProps.data.removed_at">{{
slotProps.data.name
}}</templte>
}}</template>
<router-link
v-else
:to="{
Expand Down
3 changes: 3 additions & 0 deletions web-app/packages/lib/src/assets/sass/themes/mm-theme-light/_extensions.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ body, p, dd, dl {
}
p, span, dl, li {
overflow-wrap: break-word;
}
p, dl, li {
overflow-wrap: break-word;
text-wrap: pretty;
}
dd {
Expand Down