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

1263 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
borgmanJeremy
8948fa73d0 Signed release (#1402) 
* Update releasing documents for 0.9

* testing signed release
 2021-02-27 14:57:18 -06:00
Jeremy Borgman
856e08a019 Update releasing documents for 0.9 2021-02-27 14:39:31 -06:00
Aylinux
ed32394708 Update Internationalization_tr.ts 2021-02-27 07:40:23 -06:00
borgmanJeremy
e9c7aefd2a Merge pull request #1398 from namecheap/nc/fixes-25-02-2021 2021-02-26 14:15:24 -06:00
Yuriy Puchkov
d32ed7704b fix - File name pattern editor 'Clear' and 'Reset' behavior (configuration window) 
(cherry picked from commit 116c807f166841e1ba2745e32ae1ef5fd7f25276)
 2021-02-26 09:21:19 +02:00
Yuriy Puchkov
1c5dbb3c9e Reset button doesn't reset configurations to the initial values 
(cherry picked from commit 3cc8e1bc1e6c59917169941c97ea87021e7c268f)
 2021-02-26 09:21:08 +02:00
Yuriy Puchkov
a64b9803d7 fix - MacOS - Image is not copied to the clipboard when the 'Use JPG format for clipboard' checkbox is set 
(cherry picked from commit 802d8bc3dfd2644d264938b4fc1e0adbc39d110b)
 2021-02-26 09:20:57 +02:00
Yuriy Puchkov
a1d3ec0147 fix - 'Launch at startup feature' doesn't work after uncheck/check in the Configuration window 
(cherry picked from commit 2d3b02b462300a3de24f2d4115086b5ae7c7bd46)
 2021-02-26 09:20:48 +02:00
borgmanJeremy
5705e45e32 Merge pull request #1396 from borgmanJeremy/fix_save_error_loop 
removed loop that occured when screenshot failed to save.
 2021-02-25 19:33:56 -06:00
Jeremy Borgman
acb9a08e2c removed loop that occured when screenshot failed to save. 2021-02-25 10:33:03 -06:00
borgmanJeremy
d9b9049736 Merge pull request #1391 from namecheap/nc/fix/trayicon_unchecked 
NC/fix - 'Show tray icon' checkbox is automatically unchecked when checking some other check boxes
 2021-02-24 12:35:59 -06:00
Yuriy Puchkov
e3b1d55fd8 fix - 'Show tray icon' checkbox is automatically unchecked when checking some other checkboxes 
(cherry picked from commit 3803f6725d3d7f95f36299a65557f5bfb2d15f2a)
 2021-02-24 17:32:05 +02:00
borgmanJeremy
39dcd1a291 Merge pull request #1388 from namecheap/nc/fix_macos_tool_settings 
NC/fix - MacOS - Tool Settings on secondary display is at strange position
 2021-02-24 09:26:16 -06:00
Yuriy Puchkov
b699bdd4ca fix - MacOS - Tool Settings on secondary display is at strange position 
(cherry picked from commit 672af784c5a459b5bcb617cf4a858edc98de9173)
 2021-02-23 15:23:28 +02:00
borgmanJeremy
2b0184a24a Merge pull request #1383 from borgmanJeremy/remove_symlink 
Removed icon symlinks to prevent windows issues with symlinks
 2021-02-21 20:12:33 -06:00
Jeremy Borgman
e03909c48a Removed icon symlinks to prevent windows issues with symlinks 2021-02-21 19:53:02 -06:00
borgmanJeremy
929a468fcd Merge pull request #1381 from lexikiq/patch-1 
add missing closing parenthesis
 2021-02-21 19:32:46 -06:00
lexikiq
f47fe57e4e add missing closing parenthesis 2021-02-21 14:46:30 -05:00
borgmanJeremy
5b0bb501dc Merge pull request #1377 from hosiet/pr-spdx-id 
Use SPDX-License-Identifier
 2021-02-20 19:21:59 -06:00
Boyuan Yang
fe7affa7f8 tools: pin: pintool.h,cpp: Convert to unix fileending 
Since pintool.h and pintool.cpp were using \r\n instead of \n,
this commit fixes that and use \n only.
 2021-02-20 19:26:30 -05:00
Boyuan Yang
a9c7cc7b04 Use SPDX-License-Identifier 
closes: #1374 .

Use SPDX short-form identifiers instead of lengthy copyright
header to document per-file license and copyright.

This commit updates all files under src/ directory where applicable
as well as org.flameshot.Flameshot.metainfo.xml.
 2021-02-20 19:22:53 -05:00
borgmanJeremy
7c3c075a56 Merge pull request #1365 from namecheap/merge_full_nc_to_upstream 
Merge full nc to upstream
 2021-02-20 12:52:48 -06:00
borgmanJeremy
aac2110fb3 Merge pull request #1363 from namecheap/merge_nc_to_upstream 
Update Ukrainian and Russian translations
 2021-02-20 12:47:45 -06:00
borgmanJeremy
ce008cdc7e Merge pull request #1367 from hosiet/pr-make-qhotkey-header-conditional 
Do not include QHotKey header on non-Mac system
 2021-02-20 12:47:37 -06:00
borgmanJeremy
666de9a98d Merge pull request #1375 from T3rminat0r/master 
[Translations] adding/modifying Translations in Internationalization_de_DE.ts
 2021-02-20 12:47:26 -06:00
borgmanJeremy
495fa8f53b Merge pull request #1369 from hosiet/pr-update-zh-cn-translation-0.9.0-rc2 
Refresh zh_CN translation again
 2021-02-20 12:47:18 -06:00
borgmanJeremy
9cae3d8daf Merge pull request #1366 from Vistaus/master 
Updated Dutch translations + Added Dutch desktop file translations
 2021-02-20 12:47:10 -06:00
Michael Rother
877fc7e155 [Translations] adding/modifying Translations in Internationalization_de_DE.ts 2021-02-20 19:07:46 +01:00
Boyuan Yang
200416a3d4 Refresh zh_CN translation 2021-02-20 08:38:02 -05:00
Boyuan Yang
ee2ef05178 Do not include QHotKey header on non-Mac system 
QHotKey is only used on macOS. As a result, do not unconditionally
include QHotKey headers.
 2021-02-20 08:01:02 -05:00
Heimen Stoffels
04e22af8d0 Updated Dutch translations + Added Dutch desktop file translations 2021-02-20 12:37:05 +01:00
Yuriy Puchkov
12e3c9eb39 Sync 'src' with Namecheap master 2021-02-20 13:19:07 +02:00
Yuriy Puchkov
5b15007d04 Sync root files without 'src' with Namecheap master 2021-02-20 13:11:30 +02:00
Yuriy Puchkov
c2d2b93511 Update Ukrainian and Russian translations 2021-02-20 09:13:55 +02:00
borgmanJeremy
96cfd44047 Merge pull request #1361 from borgmanJeremy/refresh_translation 
refreshed translation
 2021-02-19 15:37:50 -06:00
Jeremy Borgman
2aa816c515 refreshed translation 2021-02-19 15:37:14 -06:00
borgmanJeremy
9797ae39b2 Merge pull request #1360 from namecheap/bugfix/nc_custom-color-is-always-black 
Custom color is always black
 2021-02-19 12:46:11 -06:00
borgmanJeremy
42d6e09e41 Merge pull request #1357 from borgmanJeremy/fix_config_autostart 
fixed glitch with autostart checkboux
 2021-02-19 12:42:28 -06:00
Yuriy Puchkov
161b2202a6 Custom color is always black 2021-02-19 19:13:08 +02:00
Jeremy Borgman
ba0432a1b5 fixed glitch with autostart checkboux 2021-02-18 20:11:04 -06:00
borgmanJeremy
16fd3b2915 Merge pull request #1354 from namecheap/bugfix/nc_tray 
fix - Hide/show tray icon makes duplicates in the tray menu
 2021-02-18 19:19:07 -06:00
borgmanJeremy
0637a050b0 Merge pull request #1352 from namecheap/bugfix/nc_shortcuts-reset 
Bugfix/nc shortcuts reset
 2021-02-18 19:18:50 -06:00
Yuriy Puchkov
cb02578a9e fix - Hide/show tray icon makes duplicates in the tray menu 
(cherry picked from commit 93e3a125be3602f2fd95d02fb0e11f11b1f059be)
 2021-02-18 18:51:33 +02:00
Yuriy Puchkov
d3e6191bb5 fix - Reset configuration in the General tab resets general settings only 
(cherry picked from commit 59c84bb57bbf6c4e663662ca6e2f18eabe019f4e)
 2021-02-18 16:44:14 +02:00
Yuriy Puchkov
757ca29a85 fix - Reset configuration in the General tab resets general settings only 
(cherry picked from commit 59c84bb57bbf6c4e663662ca6e2f18eabe019f4e)

# Conflicts:
#	src/utils/confighandler.cpp
 2021-02-18 16:44:02 +02:00
borgmanJeremy
66c9f67626 Merge pull request #1345 from hosiet/pr-remove-google-material-png-icon 
data/img/material/: Remove unused png files
 2021-02-18 08:19:36 -06:00
borgmanJeremy
8ec40a4ba5 Merge pull request #1343 from yamanq/yamanq/example_ini 
Document flameshot.ini using an example file
 2021-02-18 08:19:26 -06:00
borgmanJeremy
70609548ca Merge pull request #1342 from yamanq/yamanq/custom_color 
Allow setting custom color picker in userColors
 2021-02-18 08:19:14 -06:00
borgmanJeremy
da8f2840e6 Merge pull request #1338 from namecheap/nc_0_8_5_10 
Namecheap latest updates till 10/02/20121
 2021-02-18 08:18:51 -06:00
Yurii Puchkov
3179e6d3c8 Merge branch 'master' into nc_0_8_5_10 2021-02-18 08:45:57 +02:00