fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-28 12:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,101 Commits 1 Branch 0 Tags
73fe772b70646cbef59dc44eabc984e5ca0ebef1
Commit Graph

93 Commits

Author SHA1 Message Date
Yuriy Puchkov
472d0dca29 Merge branch 'flameshot-org-master' into bugfix/RND-664-flameshot-update-history-widget-on-new-capture 2020-10-16 15:05:12 +03:00
borgmanJeremy
e98c974009 Updated releasing instructions (#1074) 2020-10-16 05:25:33 -05:00
Yuriy Puchkov
654455e9ac Merge branch 'flameshot-org-master' into merge-from-upstream 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	appveyor.yml
#	data/graphics.qrc
#	src/tools/imgur/imguruploader.cpp
 2020-10-15 15:44:49 +03:00
Jeremy Borgman
ce331924a4 organizing files 2020-10-14 11:08:12 -05:00
James LaChance
3ceaf66cd8 Add instructions for how to format code 
This took @jfly and me far too long to figure out how to actually get
the code formatted.
 2020-10-14 08:55:55 -05:00
Yuriy Puchkov
c92f8e3014 Merge branch 'flameshot-org-master' into bugfix/memory-leak 
# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt
#	data/graphics.qrc
#	src/config/configwindow.cpp
#	src/tools/imgur/imguruploader.cpp
 2020-10-11 20:49:15 +03:00
Jeremy Borgman
81c68c06d6 staging for 0.8.4 release 2020-10-10 19:43:35 -05:00
borgmanJeremy
8ff94a95a8 Cleaned up flatpak build for flathub submission (#1040) 
* Cleaned up flatpak build for flathub submission. Fixed app-id and other assets to match dbus naming.

* fixed missing updates

* fixing build issues
 2020-10-10 13:04:19 -05:00
Yuriy Puchkov
0a31d2d94d Merge branch 'flameshot-org-master' into feature/RND-656-flameshot-ability-to-lock-switching-between-s3-and-imgur-and-use-s3-only 
# Conflicts:
#	data/translations/Internationalization_eu.ts
 2020-10-06 16:13:45 +03:00
Yuriy Puchkov
b34215c6b0 Update docs/dev/release.md file to the latest one 2020-10-05 10:15:49 +03:00
heis2201
e3ef3096e9 Update german translation 
Corrected my own typo and improved Comment
 2020-10-02 13:28:58 -05:00
Yuriy Puchkov
8e92ea5ab4 Merge 0.8.3 upstream 2020-10-02 10:15:56 +03:00
Alex Pantechovskis
55bed077ca Remove outdated translation table and link the instruction repo 2020-10-01 18:56:52 -05:00
heis2201
675df1aea4 Added/Updated German translation 
Added/Updated German translation
 2020-10-01 07:42:04 -05:00
Tiago Rinaldi
ead84c502c Update CONTRIBUTING.md 
Add pt_BR translation credits
 2020-10-01 07:41:13 -05:00
Jeremy Borgman
ceb51a90bd Added releasing info for 0.8.3 2020-09-28 09:24:35 -05:00
Yuriy Puchkov
d4d3b9eae0 Merge branch 'master-flameshotorg' into master_nc_merge_upstream 
# Conflicts:
#	.travis.yml
#	appveyor.yml
#	data/graphics.qrc
#	data/img/app/keyboard.svg
#	data/img/material/black/delete.png
#	data/img/material/black/delete.svg
#	data/img/material/black/filepath.svg
#	data/img/material/black/shortcut.svg
#	data/img/material/white/filepath.svg
#	data/img/material/white/shortcut.svg
#	data/translations/Internationalization_hu.ts
#	data/translations/Internationalization_ka.ts
#	external/Qt-Color-Widgets/src/color_wheel.cpp
#	external/singleapplication/singleapplication.cpp
#	flameshot.pro
#	src/cli/commandlineparser.cpp
#	src/config/buttonlistview.cpp
#	src/config/configwindow.cpp
#	src/config/configwindow.h
#	src/config/geneneralconf.cpp
#	src/config/geneneralconf.h
#	src/config/uicoloreditor.cpp
#	src/config/uicoloreditor.h
#	src/core/controller.cpp
#	src/core/globalshortcutfilter.cpp
#	src/main.cpp
#	src/third-party/Qt-Color-Widgets/src/color_utils.cpp
#	src/tools/abstractactiontool.h
#	src/tools/abstractpathtool.h
#	src/tools/arrow/arrowtool.cpp
#	src/tools/arrow/arrowtool.h
#	src/tools/blur/blurtool.cpp
#	src/tools/capturetool.h
#	src/tools/circle/circletool.cpp
#	src/tools/circle/circletool.h
#	src/tools/copy/copytool.cpp
#	src/tools/copy/copytool.h
#	src/tools/exit/exittool.cpp
#	src/tools/exit/exittool.h
#	src/tools/imgur/imguruploader.cpp
#	src/tools/launcher/applaunchertool.cpp
#	src/tools/launcher/applaunchertool.h
#	src/tools/launcher/applauncherwidget.cpp
#	src/tools/launcher/openwithprogram.cpp
#	src/tools/line/linetool.cpp
#	src/tools/line/linetool.h
#	src/tools/marker/markertool.cpp
#	src/tools/marker/markertool.h
#	src/tools/move/movetool.cpp
#	src/tools/pencil/penciltool.cpp
#	src/tools/pencil/penciltool.h
#	src/tools/pin/pintool.cpp
#	src/tools/pin/pintool.h
#	src/tools/pin/pinwidget.cpp
#	src/tools/pixelate/pixelatetool.h
#	src/tools/rectangle/rectangletool.cpp
#	src/tools/rectangle/rectangletool.h
#	src/tools/redo/redotool.cpp
#	src/tools/redo/redotool.h
#	src/tools/save/savetool.cpp
#	src/tools/save/savetool.h
#	src/tools/selection/selectiontool.cpp
#	src/tools/selection/selectiontool.h
#	src/tools/sizeindicator/sizeindicatortool.cpp
#	src/tools/sizeindicator/sizeindicatortool.h
#	src/tools/storage/imgur/imguruploader.h
#	src/tools/storage/imgur/imguruploadertool.cpp
#	src/tools/storage/imgur/imguruploadertool.h
#	src/tools/text/textconfig.cpp
#	src/tools/text/texttool.cpp
#	src/tools/text/texttool.h
#	src/tools/toolfactory.cpp
#	src/tools/toolfactory.h
#	src/tools/undo/undotool.cpp
#	src/tools/undo/undotool.h
#	src/utils/confighandler.cpp
#	src/utils/confighandler.h
#	src/utils/dbusutils.cpp
#	src/utils/screenshotsaver.cpp
#	src/utils/screenshotsaver.h
#	src/widgets/capture/buttonhandler.cpp
#	src/widgets/capture/buttonhandler.h
#	src/widgets/capture/capturebutton.cpp
#	src/widgets/capture/capturebutton.h
#	src/widgets/capture/capturewidget.cpp
#	src/widgets/capture/capturewidget.h
#	src/widgets/capture/colorpicker.cpp
#	src/widgets/capturelauncher.cpp
#	src/widgets/infowindow.cpp
#	src/widgets/infowindow.h
#	src/widgets/panel/sidepanelwidget.cpp
#	src/widgets/panel/utilitypanel.cpp
#	src/widgets/panel/utilitypanel.h
#	translations/Internationalization_ca.ts
#	translations/Internationalization_de_DE.ts
#	translations/Internationalization_es.ts
#	translations/Internationalization_fr.ts
#	translations/Internationalization_ja.ts
#	translations/Internationalization_nl.ts
#	translations/Internationalization_pl.ts
#	translations/Internationalization_pt_br.ts
#	translations/Internationalization_ru.ts
#	translations/Internationalization_sk.ts
#	translations/Internationalization_sr.ts
#	translations/Internationalization_tr.ts
#	translations/Internationalization_uk.ts
#	translations/Internationalization_zh_CN.ts
#	translations/Internationalization_zh_TW.ts
 2020-09-24 18:52:49 +03:00
Jeremy Borgman
e298d56f32 Updated per feedback 2020-09-24 10:26:55 -05:00
Jeremy Borgman
86cf5819a3 added releasing checklist 2020-09-24 10:26:55 -05:00
Jose Riha
2cbccc3d0a Update Slovak translation (#971) 2020-09-24 07:52:59 -05:00
borgmanJeremy
58b09bf259 bumped version for 0.8.1 patch release (#968) 
* bumped versio for 0.8.1 patch release

* Updated debian log and bumped windows version

* bumped CI version

* Applied patch by @hosiet
 2020-09-23 19:57:12 -05:00
Jeremy Borgman
f8597d3b4a Adjusted metainfo to pass flathub linter 2020-09-23 10:14:14 -05:00
Boyuan Yang
42f6c8d501 appdata: Fix check errors 
The following errors are found during appdata checking:

* org.flameshot.flameshot: missing-desktop-file
* flameshot.desktop: no-metainfo

The root cause is the lack of a <launchable type="desktop-id"> tag
in the metainfo file that references the name of .desktop file.
This commit fixes that.

(Another solution would be renaming flameshot.desktop to be
org.flameshot.flameshot.desktop.)
 2020-09-21 12:02:53 -05:00
Jeremy Borgman
017578e776 Added release notes for 0.8 release 2020-09-19 13:49:02 -05:00
Boyuan Yang
74c48975d3 Update zh_CN translation again 
This commit really finishes zh_CN translation for 0.8.0 release.
The translation for .desktop file action is also updated.
 2020-09-13 20:07:25 -05:00
Alexander Kapshuna
23ae6c1579 Add zsh completion support 
Both bash and zsh completions could be supported using single file.
 2020-09-13 10:45:29 -05:00
Jose Quintana
0d171a8551 add spanish translation 2020-09-09 09:51:42 -05:00
Ahmed Zetao Yang
961ce5f732 fix: add opensuse support & correct appstream metainfo xml 
- support opensuse leap >= 15.0
- correct appstream metainfo xml name & its content, see https://www.freedesktop.org/software/appstream/docs/chap-Quickstart.html#sect-Quickstart-DesktopApps
 2020-09-08 11:13:27 -05:00
Jeremy Borgman
a892766359 fixed Plasma 5.20 issue 2020-09-08 07:39:28 -05:00
Boyuan Yang
18f18ce7ef Fix D-Bus activation name 
Originally the App uses org.dharkael.Flameshot in D-Bus.
Since we have moved the project under organization, the
name we are using now should be org.flameshot.Flameshot.
This need to be kept unified across the whole project.

This fixes D-Bus invocation problem and should fixes: #850 .
 2020-09-07 11:16:03 -05:00
Alf Gaida
9de316425f Added Action Launcher 
fixes #652
 2020-09-06 19:47:31 -05:00
Boyuan Yang
4b5137eaf4 flameshot.appdata.xml: Update metadata 
Refresh metadata in the appdata file due to project move.
 2020-09-05 09:23:42 -05:00
Jeremy Borgman
286db9ff69 Fixed translations and added feedback from PR 2020-09-03 11:51:18 -05:00
Jeremy Borgman
a37fc9bdc4 Added RFC process 2020-09-02 12:17:26 -05:00
Yuriy Puchkov
7191c99d89 release.md documentation update 2020-07-13 11:34:33 +03:00
Jeremy Borgman
f5013df306 First pass at converting from qmake to cmake. 2020-07-10 20:10:14 -05:00
Yuriy Puchkov
2a7c41f56c Release documentation update 2020-07-10 18:36:52 +03:00
Yuriy Puchkov
b4fa375e69 Add helps or/and update documentation 2020-07-07 15:16:17 +03:00
lupoDharkael
d4715750df Add basic launcher panel 2019-04-21 20:34:57 +02:00
greno4ka
9398ddd44f Add russian translation of desktop file (#475) 
* Add russian translation of desktop file

* Fix typo in desktop file fix (thx alok1111)
 2019-03-04 16:19:30 +01:00
Volodymyr Bodenchuk
2adf869282 Added Ukrainian translation. (#464) 2019-02-18 19:54:11 +01:00
Никола Радовановић (Nikola Radovanović)
36d7bf82c7 Add Serbian translation (#376) 2018-10-11 23:59:40 +02:00
sicklylife.jp
6c49a227c4 Add Japanese Translation in .desktop file, and fix typos in ja.ts file. (#367) 2018-10-05 16:36:34 +02:00
Boyuan Yang
8d782c2c47 appdata: Minor tweak on project_license line (Fix AppStream warning) (#310) 
From https://appstream.debian.org/sid/main/issues/flameshot.html :

* metainfo-validation-issue
Validation of the metainfo file found a problem:
SPDX license ID 'GPLv3+' is unknown.

According to https://spdx.org/licenses/ , the correct identifier
for GPLv3+ is "GPL-3.0-or-later" now. This commit would make
that replacement.

Signed-off-by: Boyuan Yang <073plan@gmail.com>
 2018-08-12 11:39:18 +02:00
orschiro
27be72f81a Added French translation (#301) 2018-08-07 17:34:42 +02:00
Alfredo Ramos
d09580b873 Optimize and use SVG images where possible (#281) 
SVG images have been optimized with svgo, this will slightly reduce package size though the main reason for this was to remove unneeded markup.

Image paths have been changed and merged, now the directory tree looks like this:

img
├── app
├── material
│   ├── black
│   └── white
└── preview

The reason to merge the paths is to avoid duplicate files for buttons and configuration.

SVG icons are used by default now, PNG images have not been deleted from the images directory, but they were deleted from the graphics.qrc resource file.

All image paths were updated accordingly, except in the tray icon, I could not make it work using the SVG image.
 2018-07-24 00:43:01 +02:00
Boyuan Yang
ecdd3b2e45 Fix typo; Refresh translation; Update zh-CN translation (#267) 
* Fix typos found by codespell

* redotool: Mark description string as translatable

* Refresh translation; Update zh_CN translation again
 2018-07-07 14:23:24 +02:00
Daniel Napora
2ef3ea8f0d Polish translation update (#248) 2018-06-15 00:11:05 +02:00
Dharkael
6ab7321dc2 Update release.md 2018-05-23 12:50:34 +02:00
lupoDharkael
c766b3e048 Add capture individual screens option 2018-05-08 21:23:09 +02:00