Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
m3nu authored Jun 28, 2023
2 parents e0e3efa + d087654 commit 0597769
Show file tree
Hide file tree
Showing 19 changed files with 387 additions and 315 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
name: Feature Request
about: Suggest an idea for this project.
title: 'FR: '
labels: 'type:enhancement'
title: ''
labels: ''
assignees: ''

---
Expand Down
62 changes: 33 additions & 29 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,37 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
name: Close stale issues
on:
schedule:
- cron: '50 1 * * *'

# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
with:
days-before-issue-stale: 60
days-before-pr-stale: -1
days-before-issue-close: 7
# days-before-pr-close: 10

# Issues with these labels will never be considered stale
exemptLabels:
- "status:idea"
- "status:planning"
- "status:on hold"
- "status:ready"
- "type:bug"
- "type:docs"
- "type:enhancement"
- "type:feature"
- "type:refactor"
- "type:task"
stale-issue-label: "status:stale"
stale-pr-label: "status:stale"

# Label to use when marking an issue as stale
staleLabel: "status:stale"
exempt-issue-labels: >
status:idea,
status:planning,
status:on hold,
status:ready,
type:bug,
type:docs,
type:enhancement,
type:feature,
type:refactor,
type:task,
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false

# Limit to only `issues` or `pulls`
only: issues
stale-issue-message: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
close-issue-message: >
This issue was closed because it has been stalled for 7 days with no activity.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
<br>
<br>

🤝 **This project is part of the [Google Summer of Code](https://summerofcode.withgoogle.com/) 2023 program. Apply or learn more [here](https://github.com/borgbase/vorta/wiki/Google-Summer-of-Code-2023-Ideas)!**

Vorta is a backup client for macOS and Linux desktops. It integrates the mighty [BorgBackup](https://borgbackup.readthedocs.io) with your desktop environment to protect your data from disk failure, ransomware and theft.

![](https://files.qmax.us/vorta/screencast-8-small.gif)
Expand All @@ -36,6 +34,7 @@ See our website for [download links and and install instructions](https://vorta.
- To discuss everything around using, improving, packaging and translating Vorta, join the [discussion on Github](https://github.com/borgbase/vorta/discussions).
- Report bugs by opening a new [Github issue](https://github.com/borgbase/vorta/issues/new/choose).
- Want to contribute to Vorta? Great! See our [contributor guide](https://vorta.borgbase.com/contributing/) on how to help out with coding, translation and packaging.
- We currently have students from the Google Summer Of Code 2023 Program contributing to this project.

## License and Credits
- See [CONTRIBUTORS.md](CONTRIBUTORS.md) to see who programmed and translated Vorta.
Expand Down
1 change: 1 addition & 0 deletions src/vorta/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ def set_borg_details_result(self, result):
borg_compat.set_version(result['data']['version'], result['data']['path'])
self.main_window.miscTab.set_borg_details(borg_compat.version, borg_compat.path)
self.main_window.repoTab.toggle_available_compression()
self.main_window.archiveTab.toggle_compact_button_visibility()
self.scheduler.reload_all_timers() # Start timer after Borg version is set.
else:
self._alert_missing_borg()
Expand Down
Loading

0 comments on commit 0597769

Please sign in to comment.