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

156 Commits

Author SHA1 Message Date
Yuriy Puchkov
dd54d028a1 Code refactoring - remove Q_OS_MACX (is not required, is covered by Q_OS_DARWIN) 
(cherry picked from commit 00b9aae5266aaffb9a01a6f689e1829ae8218bdc)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
a893fdfc75 Code refactoring - remove Q_OS_MAC (deprecated synonym for Q_OS_DARWIN) 
(cherry picked from commit aff1649670aa5ba64f2927933a29c62b06fee21f)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
dc7f62ab8d Fix - MacOS - get currentScreen on the edge bottom and right returns nullptr and application crashes 
(cherry picked from commit 01ae74fbed34849db485db53ffbdf4a938ebea8e)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
7bdbfc5546 fix - MacOS - Sometimes selected area remains on the screen after saving capture 
(cherry picked from commit a38825d16338bbd96d326188513164e81bfe7b60)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
8f5f656347 fix - MacOS - Pin on retina 
(cherry picked from commit 6e6025740d3c512c4f30d48681b42f997104d367)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
24f02a6dc2 fix - Ubuntu - Broken Flameshot icon in the taskbar with pinned image 
(cherry picked from commit 18722f5b29dde05f22d0a88b7e2251f81a06ca00)
 2021-02-17 18:46:12 +02:00
Jeremy Borgman
911652e5eb Fixed issue with undo and rounded rectangles 2021-02-17 07:27:38 -06:00
Jeremy Borgman
ebc94b1131 Fixed rounded rectangle bug 2021-02-11 09:02:49 -06:00
Jeremy Borgman
99493cb8d9 Fixed formatting from old PR before CI 2021-02-05 17:22:17 -06:00
Eric Blanquer
1bc2bfe2a4 draw rounded selection using thickness radius instead of drawing simple selection 2021-02-05 13:21:02 -06:00
Eric Blanquer
b1edf99be1 draw rectange if thickness == 0 2021-02-05 13:21:02 -06:00
Eric Blanquer
489769949a draw rounded rectangle using thickness radius instead of drawing simple rectangle 2021-02-05 13:21:02 -06:00
Jeremy Borgman
42f481222a Fixed imgur upload history 2021-02-04 19:45:16 -06:00
Jeremy Borgman
265e42c7b0 fixed issue with circle count undo redo 2021-01-22 19:11:00 -06:00
Jeremy Borgman
73fe772b70 resolving merge conflicts 2021-01-08 10:19:53 -06:00
Jeremy Borgman
c84b6df7d3 fixing clag format check 2021-01-05 17:01:12 -06:00
Jeremy Borgman
76ad9e5a6f first pass at adding logging framework 2021-01-05 17:01:12 -06:00
freddii
bc61bf1027 fixed typing mistakes 2020-12-28 19:12:40 -06:00
Yuriy Puchkov
d050e474d7 Add retry option on upload to s3 fail 2020-12-17 21:28:13 +02:00
Yuriy Puchkov
784da1a652 Update to a new version notification 2020-12-11 15:00:11 +02:00
Yuriy Puchkov
beb09bd0cf fix - MacOS - pixelate on Retina displays 2020-12-06 15:01:49 +02:00
Yuriy Puchkov
bf652c8f5a fix - MacOS - optimize memory utilization for "TextTool" undo feature 2020-12-06 14:21:22 +02:00
Yuriy Puchkov
a50ebf0349 fix - MacOS - optimize memory utilization for "PathTool" undo feature 2020-12-06 12:40:21 +02:00
Yuriy Puchkov
ca56d08c19 fix - MacOS - optimize memory utilization for "TwoPoint" undo feature 2020-12-06 11:57:31 +02:00
Yuriy Puchkov
586ecb07eb Code refactoring - remove number of build warnings 2020-12-06 08:33:19 +02:00
Yuriy Puchkov
3ae34418ad fix - undo/redo for MacOS retina displays for "TextTool" objects 2020-12-06 07:33:19 +02:00
Yuriy Puchkov
b03488b65d fix - undo/redo for MacOS retina displays for "PathTool" objects (brush etc) 2020-12-05 22:23:55 +02:00
Yuriy Puchkov
a515fcf4df fix - undo/redo for MacOS retina displays for "TwoPointTool" objects (line, arrow, rectangle etc) 2020-12-05 20:45:30 +02:00
Yuriy Puchkov
20115b339f fix - MacOS - Black screen when saving files with tool button key 2020-12-03 17:33:07 +02:00
Yuriy Puchkov
dbb08d01b5 fix - MacOS - Black screen when saving files with tool button key 2020-12-03 16:49:48 +02:00
Yuriy Puchkov
b4be86068d fix - MacOS - Black screen when saving files with a hotkey 2020-12-03 16:18:30 +02:00
Yuriy Puchkov
2e7d4431ce MacOS - disable CaptureToolButton 2020-12-03 12:03:51 +02:00
Yuriy Puchkov
deee448de4 Read s3 creds for upload from URL in private network (VPN) - fix 2020-11-18 22:11:19 +02:00
Yuriy Puchkov
50d5afed8f Read s3 creds for upload from URL in private network (VPN) 2020-11-18 17:57:15 +02:00
Yuriy Puchkov
f9f396bd69 fixed race condition between notifcation and clipboard (cherry-pick with manual fix) 2020-10-27 16:52:26 +02:00
Jeremy Borgman
826165c527 removed close after capture 2020-10-25 21:25:10 -05:00
borgmanJeremy
c901970091 Merge pull request #1092 from borgmanJeremy/upload_issue 
fixed race condition between notifcation and clipboard
 2020-10-22 17:58:45 -05:00
Jeremy Borgman
368421f198 fixed race condition between notifcation and clipboard 2020-10-22 17:56:25 -05:00
Jeremy Borgman
dec8c63f14 fixed formatting 2020-10-20 10:03:56 -05:00
Jeremy Borgman
62466d6581 Preparing for upstream merge 2020-10-20 06:53:59 -05:00
Yuriy Puchkov
3e7b87ccfe Code refactoring - remove not required headers and definitions 2020-10-16 15:08:08 +03:00
Yuriy Puchkov
5ea80b2ca2 Fix - update history widget on new capture 2020-10-16 15:04:17 +03:00
Yuriy Puchkov
2a138cf60f Update renames resouce for image flameshot.svg 2020-10-15 16:34:44 +03: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
Yuriy Puchkov
9eb1a7cb18 Fix - memory leaks 2020-10-15 13:36:12 +03:00
borgmanJeremy
f11073bc00 fixing icon regression (#1051) 
* fixing icon regression

* fixed symlink
 2020-10-12 08:40:35 -05:00
Yuriy Puchkov
5d9f8f002a Fix resource path for images 2020-10-12 13:38:41 +03: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
ac7142c4df fix: correcting images name 2020-10-11 07:18:16 -05:00
Ash Holland
c8767e7a1b Fix pixelation of small areas 2020-10-10 12:08:22 -05:00