benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,114 Commits 1 Branch 0 Tags
a2a84ff7642317f24853bbbb0e441da6400dbf9d
Commit Graph

116 Commits

Author SHA1 Message Date
Mikko Vedru
635c2a3eef Add info about flameshot.ini config file 2021-01-11 17:33:19 -06:00
Arun S. Negi
3f53727329 docs(readme): fix command to release the PrtScr binding on Ubuntu 
Old command throws an error:

expected value:
  (empty input)
  ^
 2020-11-25 08:56:12 -06:00
EugeneSnikhovskiy
eef2b75bf7 docs - macos build 
add macos build instruction
 2020-11-02 13:41:32 -06:00
Ahmed Zetao Yang
71be27002c docs: update gif link 2020-11-02 09:27:57 -06:00
joshuapatel
e1c6da3f94 Add Ubuntu keyboard shortcuts to the index and make heading size consistent (#1125) 2020-10-31 19:17:38 -05:00
Aditya Rachman Putra
95d8920bec Adds guide on how to setup keyboard shortcut on Ubuntu 18.04 to ease the adaptation 2020-10-27 08:14:36 -05:00
DbDibyendu
8ebb0999a8 Update README.md 
Updated the new Hotkeys
 2020-10-24 09:34:30 -05:00
Jeremy Borgman
62466d6581 Preparing for upstream merge 2020-10-20 06:53:59 -05:00
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
Ahmed Zetao Yang
2f133cab32 chore(CI): using environment files to manage environment (#1073) 
* chore(CI): using environment files to manage environment

* using Environment Files, due to the `set-env` command is deprecated and will be disabled soon
* https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
* https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-commands-for-github-actions#environment-files

* docs: add flathub store badge
 2020-10-15 08:02:27 -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
80dd24f675 Added code signing information 2020-10-14 11:08:26 -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
Ahmed Zetao Yang
36fdb3b2f4 docs: correcting svg file name 2020-10-10 20:41:40 -05:00
Yuriy Puchkov
8e92ea5ab4 Merge 0.8.3 upstream 2020-10-02 10:15:56 +03:00
Salvador Recuero
f00f994c2d Fix misspelling 
"Flmaeshot".
 2020-10-01 18:55:31 -05:00
Mehrad Mahmoudian
4f2f6bbe9e Reordered the pre-built repositories orders 
Having the operating systems together.
 2020-10-01 07:41:35 -05:00
Mehrad Mahmoudian
1034fcff3a Removed the OpenSUSE comminuty repo information 2020-10-01 07:41:35 -05:00
Mehrad Mahmoudian
35e709c80c added some brief information about systray 2020-09-30 09:37:56 -05:00
Jeremy Borgman
ecfaa2359b Fixed readme 2020-09-28 19:33:36 -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
Boyuan Yang
c7fea0e7ec README.md: Give link to download page in installation section 2020-09-23 13:43:23 -05:00
Mehrad Mahmoudian
9c0ba07984 Added the command to be used for now for shortcuts 2020-09-20 06:50:32 -05:00
MD Zaid
2d8ad0d516 Added missing Dependency, Fixed spelling mistake in a comment 
=>qttools5-dev is also required on ubuntu 20.04 (tested on pop os 20.04), so added it in
  README.md under build instructions
=> Fixed spelling mistake in a comment in src/widgets/capture/capturewidget.cpp.
 2020-09-18 07:01:54 -05:00
MD Zaid
cc4ccdb7c2 Init 2020-09-17 14:41:19 -05:00
Boyuan Yang
f18f186b46 Fix windows build badge and typos 
* Drop qmake build-dependency from CI, they should not be installed
  since we have switched to CMake.
* Update README.md badges to reflect recent Windows CI updates.
* Set doc badge to point to flameshot.org website.
* Fix a typo in src/CMakeLists.txt.
 2020-09-13 09:22:37 -05:00
Jeremy Borgman
962bba9640 updated README 2020-09-12 14:39:26 -05:00
Boyuan Yang
bc680a1ab4 README: quickfix for #873 2020-09-09 12:26:22 -05:00
David
37229454ca Add Solus package 2020-09-09 12:09:58 -05:00
Boyuan Yang
1033094a6a README.md: Improve wording 
This commit improves wording of some sentences in README.md.
 2020-09-09 11:23:56 -05:00
Boyuan Yang
53f40a330c README.md: Update badges (except AppVeyor) 2020-09-09 11:23:56 -05:00
Boyuan Yang
1da8e8277f README.md: Really fix Debian compile instruction 
This commit really closes: #791 and fix the build and runtime
dependency for flameshot.
 2020-09-07 07:27:58 -05:00
Ricardo Fuhrmann
17cefb4099 Fix keyboard shortcuts in the readme 2020-09-06 10:43:29 -05:00
Mehrad Mahmoudian
da725e3505 updated the GIF address 2020-09-06 10:19:04 -05:00
Alex Pantechovskis
f26f1304a9 remove qmake from readme 2020-09-06 18:12:58 +03:00
Alex Pantechovskis
b7c89e16e3 add cmake download link 2020-09-06 18:12:03 +03:00
Alex Pantechovskis
e7d940f60c add cmake version to readme 2020-09-06 18:00:43 +03:00
Alex P
a964f683cc Merge branch 'master' into add-build-notes 2020-09-06 17:43:44 +03:00
Alex Pantechovskis
70439c1fdc update readme for cmake 2020-09-06 17:42:24 +03:00
Martin-Eckleben
944469cd39 Improved documentation regarding default behavior without CLI arguments. 2020-09-05 10:01:38 -05:00
Boyuan Yang
924b11d975 README.md: More URL switches 
More URL switches due to project move. The CI URLs are left
intact till the CI/CD integration is finished.
 2020-09-05 09:23:42 -05:00
Boyuan Yang
7110537c4f Update some URLs due to project move 
This commit updates some URLs used within the project:

* Update README.md logo URL so that the flameshot logo can be
  shown properly.
* Update metadata used in data/debian/ directory to make
  placeholder Debian packaging working again.
* Some other quick URL fixes.

These fixes are not meant to be exhaustive and more work is
needed.
 2020-09-04 10:36:40 -04:00
Jeremy Borgman
286db9ff69 Fixed translations and added feedback from PR 2020-09-03 11:51:18 -05:00
Yuriy Puchkov
b2dbf522d9 Add proxy support for S3 upload 2020-07-17 07:39:05 +03:00
Jeremy Borgman
1ef9cad20c Added to acknowledgment 2020-07-09 07:30:40 -05:00
AlexP11223
246cc5d719 make the gui -d example more clear (#593) 2019-10-01 20:03:20 +02:00
Alex P
445a0e486e add more details about compilation, make it less scary for newcomers 2019-09-30 20:25:28 +03:00
Dharkael
234a51baea Add bitcoin as donation option 2019-05-22 18:16:43 +02:00
Alexandre ZANNI
488873e322 shortcut description (#462) 
see https://github.com/lupoDharkael/flameshot/issues/271
 2019-02-18 19:55:24 +01:00
Dharkael
abd8d0a870 README: Update Gnome shell extension reference 2019-01-01 14:26:19 +01:00