CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-07-04 22:21:23 +12:00
Code Issues Packages Projects Releases Wiki Activity
2226 commits 2 branches 79 tags 81 MiB
Commit graph

2226 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaex 5e2cb3904b Merge branch 'jevanpipitone-master' 2016-02-15 08:35:07 +02:00
Jaex 63b3008f3c Merge branch 'master' of git://github.com/jevanpipitone/ShareX into jevanpipitone-master 2016-02-15 08:32:52 +02:00
Michael Delpach 90f5accde2 Special folder support for FFmpeg path 2016-02-15 06:16:23 +08:00
Jevan Pipitone 884eb04873 #1298 run changed files through codemaid 2016-02-14 23:48:35 +11:00
Jevan Pipitone 271ca6d660 #1298 fix designer error in redoing my changes 2016-02-14 23:27:42 +11:00
Jevan Pipitone bd89f3d18c #1298 redo the changes 2016-02-14 23:12:53 +11:00
Jevan Pipitone ba60313cab Merge remote-tracking branch 'refs/remotes/ShareX/master' 
# Conflicts:
#	ShareX.UploadersLib/Forms/UploadersConfigForm.resx
 2016-02-14 22:40:40 +11:00
Jevan Pipitone 17f33ea7d2 #1298 fixed resx 
I will look to see if any more problems
 2016-02-14 21:09:04 +11:00
Jevan Pipitone 7bd5fe0f67 Fix resx 2016-02-14 21:02:59 +11:00
Jaex 48f4810dec Added vgy.me account support 2016-02-14 02:28:41 +02:00
Jaex 1c66900ec1 Revert previous merge because it had faulty resx changes 2016-02-14 02:03:03 +02:00
Jaex 99bf4a5051 Merge pull request #1303 from jevanpipitone/master 
#1298 fix
 2016-02-14 01:07:23 +02:00
Jaex bec5de8f26 Added edit quick task menu button to application settings form 2016-02-14 01:04:53 +02:00
Jaex 88299629bb Quick task editor double click to edit, made form localizable 2016-02-14 01:00:53 +02:00
Jaex 3dc0975ab5 NuGet update 2016-02-12 20:38:16 +02:00
Jaex 577fac0ad6 fixed #1267: Removed run as admin from updater 2016-02-12 20:24:24 +02:00
Jevan Pipitone 093c8a6958 Merge remote-tracking branch 'refs/remotes/ShareX/master' 2016-02-12 18:15:47 +11:00
Jevan Pipitone 2488cde26b #1298 Update 12 Feb 2016 
- Added SomeImage.Png as resource bitmap (it's located in the
ShareX.UploadersLib\Favicons\ folder)
- Use LinkLabel instead of Label for SomeImage API Link Message
- Name of any added controls is more descriptive
 2016-02-12 18:15:43 +11:00
Jaex 3c1a72a79c Added debug lines for import export 2016-02-12 04:14:25 +02:00
Jaex 09df47979b Import / Export implementation complete now 2016-02-12 03:31:11 +02:00
Jaex 354996ca8a After import update hotkeys 2016-02-12 02:15:23 +02:00
Jaex 26ba620f33 Change default backup file name 2016-02-12 01:53:56 +02:00
Jaex 30f2f5fd11 Code refactoring in mainform, applicationsettingsform 2016-02-12 01:28:03 +02:00
Jaex aeecd30850 After import update main window settings 2016-02-12 00:37:13 +02:00
Jaex 13e928a6df Few changes for UpdateSettings to be used multiple times 2016-02-11 00:15:05 +02:00
Jaex cf38ce1b93 Save all settings before export, Load all settings and update controls after import 2016-02-10 23:14:23 +02:00
Jaex eb0539a941 Allow updating settings in application form multiple times so it can be used after import 2016-02-10 22:50:45 +02:00
Jaex ed7eb9cf93 Async export, import 2016-02-10 22:27:29 +02:00
Jaex 6b6f3fdb7c Added Import function 2016-02-10 21:55:57 +02:00
Jevan Pipitone bd4e4da627 Update 10 Feb 2016 for #1298 
I forgot to put in the reference to the issue in the commit name so i
have done another one
 2016-02-10 22:03:12 +11:00
Jevan Pipitone 3a161eb131 Merge remote-tracking branch 'refs/remotes/ShareX/master' 2016-02-10 21:07:26 +11:00
Jevan Pipitone 308f24832a Update 10 Feb 2016 2016-02-10 21:07:16 +11:00
Jevan Pipitone cda86059b3 Merge remote-tracking branch 'refs/remotes/ShareX/master' 2016-02-10 20:58:10 +11:00
Jevan Pipitone 0fade80a2e Revert "#1298 update" 
This reverts commit f7e8324664.
 2016-02-10 20:57:33 +11:00
Jaex ec0da15666 Export works now 2016-02-10 03:13:40 +02:00
Jaex f842da93ba Updated 7z library to v15.14 2016-02-10 02:16:55 +02:00
Jaex 8beca81f7b fixed #1315: Update request url to use https 2016-02-10 01:53:52 +02:00
Jaex 4fadd527f8 Added export / import ui 2016-02-10 01:10:33 +02:00
Jaex ca8d2aad47 Don't use StartupPath because it will be wrong in some cases 2016-02-10 01:09:56 +02:00
Jaex 7c1bd7e51d fixed #1313: maxfile url update 2016-02-08 18:54:44 +02:00
Jaex 5e02df215f Changed quick task info defaults, removed one easter egg 2016-02-06 22:56:48 +02:00
Jaex 7ff74dcdb3 Added quick task menu editor 2016-02-06 20:10:01 +02:00
Jaex 0f8a115573 Ignore ShowQuickTaskMenu in after capture form 2016-02-06 18:46:57 +02:00
Jaex 0e36ec75b5 Quick task menu system works now 2016-02-06 18:41:05 +02:00
Jaex d43f5b9ea9 #1197 Adding quick capture task menu 2016-02-06 16:52:15 +02:00
Jaex 17cf8241fc Merge pull request #1311 from RockyTV/master 
Update Brazilian Portuguese translation
 2016-02-05 20:46:11 +02:00
Alexandre Oliveira aacb766790 Update Brazilian Portuguese translation 2016-02-05 16:13:14 -02:00
Jevan Pipitone f7e8324664 #1298 update 2016-02-05 16:58:52 +11:00
Jaex 41c0fc0920 Merge pull request #1309 from dannoe/upstream2 
Fixed/Added german translations
 2016-02-04 17:42:49 +02:00
dannoe 4ad0fe3a31 Fixed/Added german translations 2016-02-04 16:12:59 +01:00