fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-02-05 18:17:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,246 Commits 1 Branch 0 Tags
f47fe57e4e266eb2c0d2e96f0f8fd31258d70e05
Commit Graph

1246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yuriy Puchkov
90351b2f1d Code refactoring - clang-format 2021-02-18 08:43:07 +02:00
Yuriy Puchkov
637832b572 fix - merge conflict for hotkeys ShortcutsWidget 2021-02-18 08:41:28 +02:00
Yuriy Puchkov
d34609f40a fix - update info in the MacOS package plist.in file 2021-02-18 08:30:36 +02:00
Boyuan Yang
d8f8a3aaeb data/img/material/: Remove unused png files 
Flameshot after v0.8.5 release turned to use svg icons instead
of png icons for embedded Google Material Design icons. As a result,
the old png icons are now useless. This commit would remove the
leftover.

This commit closes: #1316 .
 2021-02-17 21:38:03 -05:00
Yaman Qalieh
3884497499 Document flameshot.ini using an example file 2021-02-17 14:27:35 -05:00
Yaman Qalieh
3514c3cd82 Allow setting custom color picker in userColors 2021-02-17 14:11:33 -05:00
Yuriy Puchkov
3649379a00 fix - Overview Shortcuts does not work properly #1339 2021-02-17 12:27:59 -06:00
Yuriy Puchkov
abba420186 fix - Copy URL after upload doesn't work 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
8110970d8e fix after mergin - build ubuntu 18.04 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
45f8752188 fix after mergin - CMakeLists.txt for MacOS 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
3b9fb6aeca fix after merging - Open Url & Copy Url in the history, delete question in the history 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
894556d681 Code refactoring - remove Q_OS_MAC64 (is not required, is covered by Q_OS_DARWIN) 
(cherry picked from commit e511b521cec6edd9f77916c6ee753329326a5f91)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
ebdb3743dd Code refactoring - remove Q_OS_MAC64 (is not required, is covered by Q_OS_DARWIN) 
(cherry picked from commit e511b521cec6edd9f77916c6ee753329326a5f91)
 2021-02-17 18:46:12 +02:00
Yuriy Puchkov
a5cd4cd1bc 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
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
296bed0491 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
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