Skip to content
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

[pull] master from flameshot-org:master #80

Merged
merged 3 commits into from
Feb 1, 2025
Merged

[pull] master from flameshot-org:master #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b88056c
removes Slack from documentation (#3650)
mmahmoudian Feb 1, 2025
119df55
exclude documentation modifications from CI (#3651)
mmahmoudian Feb 1, 2025
61a6074
delete current tool command name corrected (#3348)
Amangupta0000 Feb 1, 2025
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
3 changes: 3 additions & 0 deletions .github/workflows/Linux-pack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@ on:
push:
branches:
- master
- fix*
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'docs/**'

pull_request:
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'docs/**'

env:
PRODUCT: flameshot
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/MacOS-pack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,17 @@ on:
push:
branches:
- master
- feature/RND-680-macos-.dmg-package-build
- fix*
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'docs/**'

pull_request:
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'docs/**'

env:
PRODUCT: flameshot
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/Windows-pack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ on:
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'docs/**'

pull_request:
paths-ignore:
- 'README.md'
- 'LICENSE'
- 'docs/**'

workflow_dispatch:


Expand Down
2 changes: 1 addition & 1 deletion docs/RFC.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ beforehand, to ascertain that the RFC may be desirable; having a consistent
impact on the project requires concerted effort toward consensus-building.

The most common preparations for writing and submitting an RFC include talking
the idea over on our [official Slack server](flameshotworkspace.slack.com) or opening an issue on github for discussion.
the idea over on our [official Matrix Space](https://matrix.to/#/#flameshot-org:matrix.org) in the [Developers](https://matrix.to/#/!AYbNXDGTDwApLwzkNg:feneas.org?via=kde.org&via=matrix.org&via=ryan77627.xyz), or opening an issue on [Github Discussions](https://github.com/flameshot-org/flameshot/discussions).

## What the process is

Expand Down
3 changes: 2 additions & 1 deletion src/config/shortcutswidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,8 @@ void ShortcutsWidget::loadShortcuts()
appendShortcut("TYPE_MOVE_UP", tr("Move selection up 1px"));
appendShortcut("TYPE_MOVE_DOWN", tr("Move selection down 1px"));
appendShortcut("TYPE_COMMIT_CURRENT_TOOL", tr("Commit text in text area"));
appendShortcut("TYPE_DELETE_CURRENT_TOOL", tr("Delete current tool"));
appendShortcut("TYPE_DELETE_CURRENT_TOOL",
tr("Delete selected drawn object"));

// non-editable shortcuts have an empty shortcut name

Expand Down
Loading