github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-16 10:03:44 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions
1783 commits 9 branches 63 tags 67 MiB
Commit graph

1783 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Krom
cd7555099f Merge pull request #30 from greenshot/feature/FEATURE-916_Ico 
FEATURE-916: Added support for .ico files
 2016-05-31 16:41:28 +02:00
Robin
9bee8290a0 FEATURE-916: Added some support for .ico files when writing, this will currently only write 256x256 .ico files!!! These files are not supported by Windows XP and older! 2016-05-25 22:56:01 +02:00
Robin
b04be588e5 FEATURE-919: Added increase and reduce size (Ctrl + & Ctrl -) 2016-05-24 15:23:45 +02:00
Robin
b638b1cea2 Another NPE fix 2016-05-24 13:49:46 +02:00
Robin
7c3812c529 Fixed a NPE while disposing the StepLabelContainer 2016-05-24 13:33:24 +02:00
Robin
44fba68477 Removed unneeded file. 2016-05-24 13:19:30 +02:00
Robin
0323705513 Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9 2016-05-24 13:15:16 +02:00
Robin
45615275cf Made the re/undo code from the branch work in this, this is a manual copy as something went horribly wrong with the repository. Before building I first want to check if everything is there.[skip ci] 2016-05-24 12:48:11 +02:00
Robin
9702ac730f Fixed SpeechbubbleContainer 2016-05-23 23:34:17 +02:00
Robin
25efb8eedf Merge remote-tracking branch 'remotes/origin/feature/no_grippers' 2016-05-23 23:27:37 +02:00
Robin
8aa4475d8f Enhanced log statement [skip ci] 2016-05-23 23:23:23 +02:00
Robin
7872f2f7e4 Merge remote-tracking branch 'remotes/origin/feature/BUG-1887_removed_grippers' 
# Conflicts:
#	Greenshot/Drawing/DrawableContainer.cs
#	Greenshot/Drawing/SpeechbubbleContainer.cs
 2016-05-23 22:03:01 +02:00
Robin
9ab6bff116 Fixed serialization issues, and made sure the arrow / line have the right adorners. 2016-05-23 16:43:10 +02:00
Robin
5b2d5b1397 Fixed most adorner related drawing issues, need to test a few more (freehand) 2016-05-23 15:39:21 +02:00
Robin
31db071394 Trying to replace the Gripper (which is a Label/Control) with adorners (custom code). This should prevent the slow cleanup, reduce resources and speedup the editor. Also we should have better "UI" feedback. This is still very experimental. 2016-05-23 13:32:52 +02:00
Robin
c02bd6ce62 Enhanced log statement [skip ci] 2016-05-22 13:16:28 +02:00
Robin
bd71f47e95 Fixed a stacktrace overflow due recursive loop when processing Metro-Apps (Windows 8, which also run on 10) 2016-05-22 13:13:07 +02:00
Robin
1469f1fa41 BUG-1965: Fixed a bug where a 1 pixel wide border around an active window is visible. Probably due to the "shadow" being captured too. 2016-05-22 00:16:06 +02:00
Robin
d25021631e FEATURE-945: Added environment variables to the external command (also removed unused imports and made some variables readonly) 2016-05-20 23:43:31 +02:00
Robin
4f326c9c0e [skip ci] Added horizontal scrolling with the mousewheel when keeping shift pressed. 2016-04-29 16:44:16 +02:00
Robin
db5a92dea4 Fixed build, and updated readme. 2016-04-26 23:42:25 +02:00
Robin
728f49944f BUG-1890: Fixed wrong cropping when window is maximized on Windows 10 2016-04-26 23:33:17 +02:00
Robin
5c04af1684 Undo of some cleanup which causes issues, 2016-04-26 23:13:37 +02:00
Robin
e781bdcd5c BUG-1949: Fixed imgur issues, especially the delete. 2016-04-26 23:12:45 +02:00
Robin
066ea19568 BUG-1945: Fixed a problem during startup, where Greenshot can't specify the ServerCertificateValidationCallback which is needed to ignore SSL errors. 2016-04-26 21:21:00 +02:00
Robin
0fa6224ea6 BUG-1941: Fixed a NullReferenceException, which is the issue itself. Don't know if it was caused by a different problem. 2016-04-26 20:44:47 +02:00
Robin
98e6be5eb6 Small cleanups [skip ci] 2016-04-17 23:32:22 +02:00
Robin Krom
02a06a12b0 Merged in dpbremner/greenshot (pull request #15) 
marshal return types, add CharSet.Unicode to functions that lack it, marshal BOOL parameters
 2016-04-17 11:33:08 +02:00
David Bremner
d780d337e4 marshal return types, add CharSet.Unicode to functions that lack it, marshal BOOL parameters 2016-04-16 18:45:02 -07:00
Robin Krom
01d59ad602 Merge pull request #23 from greenshot/bugfix/BUG-1935_clipboard_retry 
BUG-1935: Increased the retry delay a bit more [skip ci]
 2016-04-11 14:26:17 +02:00
Robin Krom
e43339ea90 BUG-1935: Increased the retry delay a bit more 
The maximum waiting time should now be 3 seconds.
 2016-04-11 14:25:12 +02:00
Robin Krom
18f1a93b21 Merge pull request #22 from greenshot/bugfix/BUG-1935_clipboard_retry 
BUG-1935: increased retries and delay a bit.
 2016-04-11 11:58:13 +02:00
Robin
4435d76699 BUG-1935: increased retries and delay a bit. 2016-04-11 11:56:52 +02:00
Robin Krom
fca40f1c97 Merge pull request #21 from greenshot/bugfix/BUG-1935_clipboard_retry 
BUG-1935: Trying to make clipboard actions more stable.
 2016-04-11 10:40:49 +02:00
Robin Krom
1d83b7c7bf Merge pull request #20 from greenshot/bugfix/BUG-1933_registry_permissions 
Fix for BUG-1933 bad Registry permissions
 2016-04-11 10:39:45 +02:00
Robin
189a6de1d6 BUG-1935: Trying to make clipboard actions more stable. 2016-04-11 10:38:52 +02:00
Krom, Robertus
7ff53bdb69 BUG-1933: A change to the Registry permissions, this should solve a security vulnerability. Used the time to fix the file-type registration too. 2016-04-06 16:40:46 +02:00
jklingen
6bae718876 Merge pull request #15 from greenshot/bugfix/BUG-1898_gpl_license 
Change the GPL text to GPLv3
 2016-03-27 21:52:10 +02:00
Robin
deb054b6fb Fixed License [skip ci] 2016-03-25 12:11:05 +01:00
Robin
5854c771bd More SF references removed 2016-03-24 23:29:06 +01:00
Robin
ea6d5ee2f2 Fixed PS1 call 2016-03-24 23:10:29 +01:00
jklingen
6a094f4671 Merge pull request #18 from greenshot/revert-17-revert-16-feature/no_sf 
Revert "Revert "Removed most references to SF""
 2016-03-24 23:06:29 +01:00
jklingen
e409392f32 Revert "Revert "Removed most references to SF"" 2016-03-24 23:04:47 +01:00
Robin
f15dfbf61c Merge branch 'release/1.2.9' of https://github.com/greenshot/greenshot into release/1.2.9 2016-03-24 23:03:15 +01:00
Robin
b10dfe43ad Removing bitbucket references, the scripts are local so no need to download. 2016-03-24 23:02:39 +01:00
jklingen
c474bf6109 Merge pull request #17 from greenshot/revert-16-feature/no_sf 
Revert "Removed most references to SF"
 2016-03-24 22:56:52 +01:00
jklingen
2599ff5b7c Revert "Removed most references to SF" 2016-03-24 22:54:16 +01:00
jklingen
3c614aacd1 Merge pull request #14 from greenshot/bugfix/BUG-1876_Already_running_message 
Partial fix for BUG-1876 "already running"
 2016-03-24 22:20:52 +01:00
jklingen
5201009920 Merge pull request #13 from greenshot/feature/BUG-1884_ocr_trailing_blank_spaces 
Fix for BUG-1884, added a trim call for the scanned text
 2016-03-24 22:18:52 +01:00
jklingen
258ffbb95f Merge pull request #16 from greenshot/feature/no_sf 
Removed most references to SF
 2016-03-24 22:18:03 +01:00