Merge remote-tracking branch 'origin/release/1.3' into release/1.3

This commit is contained in:
jklingen 2025-07-23 17:04:26 +02:00
commit aa486a26c4
4 changed files with 19 additions and 2 deletions

View file

@ -1,6 +1,7 @@
name: Build and Deploy name: Build and Deploy
on: on:
workflow_dispatch:
push: push:
branches: branches:
- 'release/1.*' - 'release/1.*'

View file

@ -3,7 +3,7 @@ name: Update GitHub Pages
on: on:
workflow_dispatch: workflow_dispatch:
release: release:
types: [published] types: [published, unpublished, created, edited, deleted, prereleased, released]
jobs: jobs:
update-gh-pages: update-gh-pages:

View file

@ -21,10 +21,25 @@ Being easy to understand and configurable, Greenshot is an efficient tool for pr
About this repository About this repository
--------------------- ---------------------
This repository is for Greenshot 1.3, currently in development, but is the next planned release This is the development branch is for Greenshot 1.3, which has been first released on 2025-07-14.
Releases Releases
-------- --------
You can find a list of all releases (stable and unstable) in the [Github releases](https://github.com/greenshot/greenshot/releases) or in the [version history on our website](https://getgreenshot.org/version-history/). You can find a list of all releases (stable and unstable) in the [Github releases](https://github.com/greenshot/greenshot/releases) or in the [version history on our website](https://getgreenshot.org/version-history/).
The [downloads page on our website](https://getgreenshot.org/downloads/) always links to the latest stable release. The [downloads page on our website](https://getgreenshot.org/downloads/) always links to the latest stable release.
Trademark and Logo Usage Policy
-------------------------------
The Greenshot logo and trademark are the property of the Greenshot development team. Unauthorized use of the logo and trademark is generally prohibited. However, we allow the use of the Greenshot name and logo in the following contexts:
* In blog posts, articles, or reviews that discuss or promote the Greenshot, provided that the usage is fair and does not imply endorsement by Greenshot.
* In educational materials or presentations that accurately represent the project.
Please refrain from using the Greenshot logo and trademark in any promotional materials, products, or in a manner that may cause confusion or imply endorsement without prior written permission.
If you have any questions or wish to seek permission for other uses, please contact us.
Thank you for your understanding and cooperation.

View file

@ -135,6 +135,7 @@ LanguageDetectionMethod=uilanguage
MinVersion=6.1sp1 MinVersion=6.1sp1
OutputDir=..\ OutputDir=..\
PrivilegesRequired=lowest PrivilegesRequired=lowest
PrivilegesRequiredOverridesAllowed=commandline
SetupIconFile=..\..\src\Greenshot\icons\applicationIcon\icon.ico SetupIconFile=..\..\src\Greenshot\icons\applicationIcon\icon.ico
#if CertumThumbprint != "" #if CertumThumbprint != ""
OutputBaseFilename={#ExeName}-INSTALLER-{#Version}-UNSTABLE OutputBaseFilename={#ExeName}-INSTALLER-{#Version}-UNSTABLE