Commit graph

362 commits

Author SHA1 Message Date
Jaex f04efda0e3 Change Google Cloud Storage icon 2018-04-26 20:39:43 +03:00
Jaex 482d2bb6fc Shared folder UI improvements 2018-04-22 12:10:23 +03:00
Matthew Burnett 65c15e8035 Fix icon pt2 2018-04-21 18:31:03 -04:00
Matthew Burnett d1c01ff207 Fix merge 2018-04-20 10:58:51 -04:00
Matthew Burnett d26b0eb4bc Add icon
Fix error
2018-04-20 01:33:58 -04:00
Jaex a36c61431a Removed Google URL shortener (https://developers.googleblog.com/2018/03/transitioning-google-url-shortener.html) 2018-04-20 02:02:45 +03:00
Jaex f00c3b1d56 Added id-ID.resx files to csproj 2018-04-20 00:36:17 +03:00
Matthew Burnett 233d822c24 Begin GCS 2018-04-19 17:30:56 -04:00
Jaex 9f1728bc5e Add uk.resx files to csproj and enable localizable in few forms 2018-04-19 23:10:17 +03:00
SupSuper 080bce2126 Secure OneDrive auth per PCKE recommendations 2018-04-16 21:55:20 +01:00
SupSuper 21a813bb6f Merge branch 'master' into youtube-uploader 2018-04-10 02:00:40 +01:00
SupSuper d6bc062bff Add Youtube to file uploaders 2018-04-10 01:49:40 +01:00
Jaex bc0918337d NuGet update, rename few classes 2018-04-08 12:12:52 +03:00
Matthew Burnett 0afee54b55 Some fixes 2018-04-03 20:25:35 -04:00
Matthew Burnett e55a2f2c1c Add Firebase Dynamic Links URL Shortener 2018-04-01 03:31:12 -04:00
Jaex ffe3949769 Added support to escape custom uploader argument and header patterns 2018-03-26 08:04:55 +03:00
Jaex fafe0d4207 Update MegaApiClient 2018-03-13 08:48:07 +03:00
Jaex b115cb8cd6 Removed System.Net.FtpClient instead using FluentFTP library 2018-03-01 00:22:51 +03:00
Jaex 54a7d80d2f fixed #1868: Upgrade .NET Framework version to 4.6.2 2018-02-28 13:04:37 +03:00
Jaex d0c2275207 Support name patterns in custom uploader headers too 2018-02-03 22:21:24 +03:00
L1Q 7bdbd5980b Update Russian translation 2018-01-13 15:43:47 +02:00
Fyers f2a7f03c8d Added german translation for OCRSpaceForm 2018-01-07 17:17:45 +01:00
Charles Milette 8d9f486f39
Use a SharedAssemblyInfo to minimize duplication 2018-01-01 12:32:18 -05:00
Jaex 8448ec220c Removed .nuget folder because it is not necessary anymore 2017-12-24 10:22:54 +03:00
Jaex 5d57bc40dd Update Mega lib 2017-12-05 20:44:57 +03:00
Jaex 8e3d7d971e Removed dead uploader Uplea 2017-10-29 11:56:26 +03:00
Jaex 77de435aae fixed #1797: Updated SSH.NET to latest stable build 2017-10-19 16:48:28 +03:00
Jaex 9a3f872575 #130: Removed shutdown minus.com uploader 2017-10-19 16:31:30 +03:00
Jaex fa3c04fad6 Fix image effect order changes 2017-09-25 09:58:16 +03:00
Jaex a9b0982b4c Adding custom URL sharing service 2017-09-10 13:55:21 +03:00
Jaex 0fd87b61e0 Rename Picasa to Google Photos and use Google Photos icon 2017-09-05 22:43:36 +03:00
Jaex 88e6282b74 #2734: Removed Imgland 2017-08-26 13:11:50 +03:00
Jaex 128026f51d #2734: Removed SomeImage 2017-08-26 13:09:42 +03:00
Jaex 1193cc05cc Update Json .NET 2017-08-20 18:52:02 +03:00
Jaex a115954301 Added Italian files to project 2017-07-23 21:57:10 +03:00
Jaex f4bd3e270f Removed unused FTP class 2017-06-14 15:24:36 +03:00
Jaex 378ae2125a Add missing WindowsStore constants 2017-05-03 16:56:11 +03:00
Jaex 99cc700c7d Added WindowsStoreDebug configuration 2017-04-21 18:22:15 +03:00
Jaex 602c756a2c Added WindowsStore build configuration 2017-04-21 01:59:19 +03:00
Jaex d881a54040 Update json .net 2017-04-06 10:53:37 +03:00
Jaex 3700fc30d6 Added Gfycat icon 2017-03-28 03:46:05 +03:00
Jaex b2b3e9de1a Update Json.NET 2017-03-24 14:56:49 +03:00
Alan Tsai 38163a82b7 [Translate]zh-Tw for Sharex.Uploaders project 2017-03-21 23:42:37 +08:00
Jaex 87a421a9ed If current endpoint exists in endpoints list then select it automatically 2017-03-21 09:31:47 +03:00
Jaex 84f2de7649 Added DreamObjects support,
Amazon S3 Identifier optional now it can be automatically populated from hostname
2017-03-20 02:05:23 +03:00
Jaex 4a2afc4d42 Also added Google image search as sharing service 2017-03-18 08:41:02 +03:00
Jaex 058872b87a Added Amazon S3 regions list, added custom region support 2017-03-17 03:15:19 +03:00
Jaex af1c47a03d Initial Amazon S3 implementation, currently signature not matches 2017-03-10 20:10:16 +03:00
Jaex 05400bf552 Remove current Amazon S3 implementation 2017-03-10 19:37:23 +03:00
Max Schmitt b139c0650c - improved variable names
- fixed favicon issue
- removed regex config checking
2017-02-26 21:44:47 +01:00
Max Schmitt 54bbae58ee Added PlikSettings class 2017-02-26 20:27:40 +01:00
Max Schmitt bcac721a25 Added Plik file uploader 2017-02-26 17:17:02 +01:00
Jaex d6bc30b170 NuGet update 2017-02-22 16:32:56 +03:00
Niklas Mollenhauer a7d0664b67 Remove RapidShare 2017-02-10 22:54:08 +01:00
Jaex bd39d4d827 fixed #2268: Removed sli.mg image uploader 2017-02-06 08:56:13 +03:00
Jaex a35beedc1e Removed unused media crush uploader 2017-02-03 09:04:39 +03:00
Tomasz Wisniewski 27b6d1c9a3 Code refactoring - minor issues 2017-01-27 11:21:46 +01:00
Tomasz Wisniewski 0e61fb954c Added infrastructure for Azure Storage 2017-01-26 12:41:49 +01:00
Jaex f1f996624c Update AWSSDK 2017-01-25 15:49:43 +03:00
Jaex f8fb45c8b9 #1058: Update AWSSDK 2017-01-19 16:22:58 +03:00
QDT 9315a054ca Added support for text upload to pastie.org 2016-12-07 17:07:29 -08:00
Gregoire Pailler 0596e09523 #1737 Updated MegaApiClient to 1.3.1 (without HttpClient dependency). Customized ChunksPackSize value to upload all chunks in a single fragment (instead 1MB fragments) 2016-11-07 20:35:37 +08:00
Gregoire Pailler 230aa94f97 #1737 Updated MegaApiClient to 1.3.0. Customized ChunksPackSize value to upload files in 512MB fragments (instead 1MB fragments) 2016-11-06 21:30:37 +08:00
Jaex 3e9c561c0d Adding uploader filter support which will allow configuring uploader destination per file extensions, file size etc. 2016-10-28 13:05:56 +03:00
Jaex 557869d705 fixed #1797: Return SSH.NET library to previous version until new build with fix release 2016-09-19 17:00:10 +03:00
osfancy 64cc6f39ec Closes #1466 - Uplea Integration (#1899)
* Initial check-in to address feature enhancement request #1466.

* Checking in missing constructor parameter so fork is stable.

* Wrapping up Uplea integration support for #1466.

* Reverted Uploader.cs to earlier version as those changes weren't actually needed.

* Removed use of DataContractJsonSerializer, using JSON .NET instead. Updated the Uplea class to not store the configuration object internally, but to only pull out the API key when the config is passed through its constructor.

* Incorporating recent round of refactoring changes suggested by Jaex.

* Addressing issue with user workflow on the Uplea destination configuration tab.

* Attempt to reconcile UploadersConfigForm.resx.

* Fixing the name for an unnamed label. Updating resx formatting for base64 encoded pbDropboxLogo.Image value; since the diff on GitHub was showing a material change although VS diff ignores the formatting difference. Removed unneeded string.Format from Upload() in Uplea along with the set for IsURLExpected (since it is already true by default).

* Removed extra whitespace next to the end of the value tag since GitHub diff was still showing a difference.

* Removing references to label4 from resx which weren't removed by VS automatically when the control was renamed. The new entries for the renamed control lblUpleaEmailAddress already exist in the file.
2016-09-13 02:13:34 +03:00
Jaex be5f57ef9a NuGet update 2016-09-13 00:46:06 +03:00
Jaex c7b38b59f6 Removed up1.ca because service was down for long time 2016-08-25 20:54:19 +03:00
Jaex f64d11f203 NuGet update 2016-08-19 01:43:51 +03:00
Jaex fa027d8298 fixed #1755: Added transfer.sh file uploader 2016-07-31 09:59:17 +03:00
Jaex b2b1051225 NuGet update 2016-07-14 21:11:12 +03:00
Jaex 971f2ee369 NuGet update 2016-07-11 23:24:51 +03:00
Jaex 190066b5b2 Removed unused image files 2016-06-29 23:21:05 +03:00
Jaex fc6a214f20 Removed DropboxFilesForm because with API v2 many things missing so it will be difficult to make it work 2016-06-29 23:00:22 +03:00
Jaex 3425e167db Move few classes to parent folder 2016-06-28 23:57:34 +03:00
Jaex 418f899127 Added puush mode 2016-06-20 09:44:21 +03:00
Jaex 21f53ce6b6 Adding puush file uploader 2016-06-11 21:54:14 +03:00
Jaex f72885aa4b NuGet update 2016-06-10 04:07:07 +03:00
Jaex 99f2629e4e fixed #1584: Added sli.mg image uploader 2016-05-28 12:20:28 +03:00
Jaex 75d0be62f9 Little changes about lithiio 2016-05-15 15:22:13 +03:00
lithium_ 80e26e9bfe New File Uploader - lithi.io
Added a new file uploader.
2016-05-15 04:57:30 -07:00
Jaex 840f6e0044 Added Text capture (OCR) to capture menu 2016-05-13 08:56:33 +03:00
Jaex 0facef414b Adding after capture tasks OCR support 2016-05-13 02:43:33 +03:00
Jaex c430351c75 Added OCRSpace class 2016-05-13 02:03:54 +03:00
Jaex 8149340db7 NuGet update 2016-05-01 11:37:41 +03:00
Jaex 08607ef649 Added IGenericUploaderService and GenericUploader which will be inherited by image, text, file services and uploaders 2016-04-04 12:53:11 +03:00
Jaex af486660d3 Before upload, check config and if config is invalid then tell users to configure service from destination settings window 2016-04-04 12:12:21 +03:00
Jaex a147cb2f34 fixed #1444: Removed Openload file uploader, check referenced issue for reason 2016-03-25 22:39:19 +02:00
Jaex 8f02ec41dc Base uploaders and services moved to their own folders, removed unused references, renamed HelperClasses to Helpers 2016-03-23 21:05:31 +02:00
Jaex 82f5a69cc5 Mainly naming changes and other small service changes 2016-03-23 20:47:59 +02:00
John Du Hart 851ebecad0 Adding missing DeliciousSharingService
Moving validation outside of UploadersConfig, into separate class
2016-03-22 22:57:02 -04:00
John Du Hart e0ce2f68a7 Implemented sharing services in upload lib 2016-03-22 22:45:12 -04:00
Jaex 1ea4dd1e67 Added thread unsafe temporary workaround for task reference issues 2016-03-23 00:36:41 +02:00
Jaex 72627c0ba6 All text uploaders using TextUploaderService now 2016-03-22 18:28:55 +02:00
Jaex a59cd2f60b Added URLShortenerService, using it on Bitly for now 2016-03-22 02:26:04 +02:00
Jaex 5a1dbf1958 Added FileUploaderService, using it on Dropbox for now 2016-03-22 02:16:09 +02:00
Jaex 8c58369192 Added TextUploaderService, using it on Pastebin for now 2016-03-22 00:51:37 +02:00
Jaex d3fb5ac7bd Architecture change to make it easier to add a new uploader, using it on Imgur for now 2016-03-21 22:26:47 +02:00
Jaex 63cc1e9fac Added credits for Openload 2016-03-21 19:56:36 +02:00
Laurent Fourrier 1ffad76f29 Fixed #1370 : Added support for openload.co 2016-03-21 18:10:34 +01:00
Jaex fbd4604192 #1383 Installed previous version of FtpClient library because new version have problems 2016-03-20 19:42:21 +02:00
Jaex da2b593d00 NuGet update 2016-03-20 17:37:40 +02:00
Jaex a04d10c05c fixed #1416: Added raw URL support to GitHub Gist 2016-03-18 14:08:24 +02:00
Jaex 6a992a0857 fixed #1400: Added AcceptInvalidSSLCertificates option to Application settings -> Advanced tab which can be used by people who using self signed certificates 2016-03-14 03:10:19 +02:00
Michael Delpach af0dbcce12 remove Copy from UploadersLib 2016-03-12 09:10:42 +11:00
Jaex 84e4ee4a9a NuGet update 2016-03-02 02:06:53 +02:00
jibcore 024cfed7ed Add new image uploader (imgland.net) 2016-02-22 02:21:06 +02:00
Jaex 356381f64d NuGet update 2016-02-21 14:37:03 +02:00
Jaex 98ec05eeab Added Chevereto preset uploaders list, defaults to ultraimg.com 2016-02-18 12:10:30 +02:00
Jaex c3a739c3ef Using proper SomeImage icon 2016-02-15 09:02:33 +02:00
Jevan Pipitone bd89f3d18c #1298 redo the changes 2016-02-14 23:12:53 +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 3dc0975ab5 NuGet update 2016-02-12 20:38:16 +02: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 4ddc5bfc7c nuget csproj changes 2016-01-10 03:15:33 +02:00
Jaex 553f38ab5a Custom uploader export will ignore null or empty values to have more compact output 2015-12-21 16:31:59 +02:00
Corin Simpson-Bryars d7b50bdae7 Adds s-ul support 2015-12-12 02:30:12 +00:00
Jaex 17be947907 fixed #1139: nuget update 2015-12-06 18:23:27 +02:00
Jaex a0987767f4 Added custom uploader response parsing tooltip 2015-12-04 23:34:26 +02:00
lucas 55f92ce07f Add streamable file uploader 2015-12-01 13:02:06 -05:00
Jaex 0bf1f3f873 Ready for release 2015-11-21 17:52:18 +02:00
Jaex f7e80cb176 Added uguu.se file uploader 2015-11-18 15:07:56 +02:00
Jaex c8dcc27104 In default clipboard image copy background will be filled with white because alpha channel not supported 2015-11-10 23:07:13 +02:00
Jaex ee540696f7 Removed Steam button from main window, NuGet update 2015-11-05 02:27:12 +03:00
Jaex 78038cbfec fixed #988: NuGet update 2015-10-28 09:33:55 +02:00
Jaex 8c10e2a910 Merge pull request #1084 from L1Q/master
Russian translation added
2015-10-26 21:15:56 +02:00
L1Q 8f6ec0fbec Russian translation status: 100%
Fixed lots of typos and mistakes.
2015-10-26 15:33:53 +02:00
L1Q 64850e41f4 Russian translation status: ~99%
Still have to check everything for typos and mistakes.
2015-10-26 02:21:21 +02:00
Jaex 4c8cf9f547 Scrolling capture UI improvements and scroll top method option 2015-10-25 03:22:11 +03:00
Jaex 22863b99e8 fixed #1071: Account ID should be long now because of Imgur ID changes 2015-10-19 00:44:39 +03:00
Jaex b6f9265f4e Added Vietnamese resx files to csproj 2015-10-15 23:38:18 +03:00
L1Q c88cae0afa Added russian translation 2015-10-14 10:33:02 +03:00
unknown d17c3c0478 added Seafile class, added to designer, etc. only thing nonfunctional is sharing URLs 2015-10-12 21:24:49 -04:00
Jaex e2f3aeabf1 Added Pomf settings tab 2015-10-06 03:09:16 +03:00
Jaex 4b546f4d90 Renamed Maxfile to Pomf and it will support all Pomf uploaders 2015-10-05 20:54:29 +03:00
Scratch 800977cac2 partial support 2015-10-03 13:29:23 +10:00
Jaex 81e3911d38 Removed unused Hubic codes 2015-09-27 08:16:41 +03:00
Jaex 6fa99b0b4b Release 2015-09-18 13:26:59 +03:00
Jaex 48419b6497 Removed lnku because site is closed 2015-09-17 11:25:36 +03:00
Jaex 6951e97025 Added Steam configuration 2015-09-06 11:19:09 +03:00
Jaex cb4000e18f Release 2015-09-05 09:51:38 +03:00
Jaex 67c4c4e5b9 Portable creation improvements 2015-09-02 16:46:20 +03:00
Jaex 4cdbdebdb8 Trying to use Security.Cryptography library (http://clrsecurity.codeplex.com) for Up1 file uploader 2015-08-26 04:19:03 +03:00
Jaex e1a47d90dd NuGet update 2015-08-22 18:05:39 +03:00
Jaex 9502b87946 Merge pull request #896 from RockyTV/master
Portuguese-Brazil translation
2015-08-11 22:04:49 +03:00
Jaex c34d7b7114 Added missing hard coded strings to resx, Updated Turkish translations 2015-08-11 20:33:30 +03:00
Alexandre Oliveira a8f90cf96f I don't know what changed in this commit 2015-08-10 15:55:53 -03:00
Alexandre Oliveira 09367fb339 Another bunch of translations. Almost done translating ShareX 2015-08-09 15:56:05 -03:00
Athos Castro Moreno 6cd612de1a FTPClientForm, ScreenRegionForm, Properties/Resources. 2015-08-07 10:05:19 -03:00
Jaex 20bbf49dfd NuGet Update-Package -Reinstall -IncludePrerelease 2015-08-07 13:22:32 +03:00
Jaex 3f1fbddebe Using AWSSDK.S3 instead of whole AWSSDK 2015-08-07 12:31:41 +03:00
Athos Castro Moreno c193e4d36c Several minor translations 2015-08-05 20:34:44 -03:00
Athos Castro Moreno cfaec09ed4 AccountsControl, AccountTypeControl, Resources 2015-08-05 20:17:53 -03:00
Athos Castro Moreno 3b90bff3c1 Translated DropboxFilesForm and EmailForm 2015-08-04 23:57:07 -03:00
Daniel McAssey 4aa71f9bc7 Add Self-Hosted Polr support 2015-08-04 19:49:07 +01:00
Daniel McAssey 0de2447d6e Add OneTimeSecret text uploader 2015-08-03 13:59:33 +01:00
Daniel McAssey ca610da106 Add SomeImage image uploader 2015-08-02 19:46:02 +01:00
Jaex fc33955ed6 Added ShareX Greenlight URL 2015-08-01 23:32:16 +03:00
Jaex e396c9260f Added Greenlight button 2015-07-25 18:06:32 +03:00
Jaex 44f58e32ba csproj fixes 2015-07-23 09:00:51 +03:00
Daniel McAssey a9502147a5 Add 2.gp URL Shortener 2015-07-21 00:25:45 +01:00
Jaex 90ec3c1623 Merge pull request #808 from DanielMcAssey/feature-4
Add VURL.com URL Shortener
2015-07-21 01:51:12 +03:00
Daniel McAssey b1060d8e02 Add VURL.com URL Shortener 2015-07-20 23:48:17 +01:00
Jaex 5fb48cc552 Windows 10 maximized window region fix 2015-07-21 01:44:03 +03:00
Daniel McAssey e3c5616b8d Add qr.net URL shortener service 2015-07-20 22:52:51 +01:00
Daniel McAssey cffa6c8754 Add CoinURL URL shortener 2015-07-20 21:12:13 +01:00
Daniel McAssey 843a07566b Add LnkU URL Shortener 2015-07-20 15:51:34 +01:00
Jaex 2c2e776b81 Imgur response improvements 2015-07-19 21:11:34 +03:00
Jaex f7dc1e544a fixed #781: Drag drop window hotkey will use hotkey task settings 2015-07-15 15:02:27 +03:00
Jaex 64897a45b4 nuget update for #769 mega issue 2015-07-14 18:55:07 +03:00
Jaex d9caedf16c Small changes for Up1, added credit for it 2015-06-29 22:57:14 +03:00
Keith 12a8af5611 Unfortunately CCM isn't a streaming cipher mode, and so we need to bring everything into memory to encrypt. In this case, we'll limit the file size to 50MB (which the server defaults to anyways).
Also, remove all remaining remnants of ClouDeveloper.
2015-06-28 17:10:14 -04:00
Keith 1bd0903a89 Add icon to Up1 destination 2015-06-28 13:18:47 -04:00
Keith 7e3265854e Added in everything else for Up1 support 2015-06-28 12:30:44 -04:00
Jaex 721966c2f0 NuGet update 2015-06-28 16:04:27 +03:00
Jaex aee83e1536 fixed #733: Added maxfile.ro file uploader 2015-06-20 09:51:27 +03:00
Jaex fe8b755406 Added dropfile.to file uploader 2015-06-20 09:36:44 +03:00
Jaex de3f8ed74f Revert "pt-BR files added to projects"
This reverts commit 20353f561c.
2015-06-05 09:53:03 +03:00
Corey Cormier 6c66e6360d Add VideoBin support 2015-06-06 00:20:42 -05:00
Jaex 20353f561c pt-BR files added to projects 2015-06-03 08:03:41 +03:00
Jaex 93b8c22bbc Added option to remember recent links in tray menu 2015-05-25 17:25:19 +03:00
Jaex ea4e246427 Added missing language folders to portable 2015-05-17 04:05:15 +03:00
Jaex fc7cf0a1ec Merge branch 'master' of github.com:ShareX/ShareX 2015-05-14 01:58:41 +03:00
Jaex ab63c8b746 Updated AWSSDK 2015-05-14 01:58:12 +03:00
Alan Edwardes 2f2c8f53ec Made Amazon S3 uploader more robust, additional error handling. Moved classes to their own files. 2015-05-13 23:46:39 +01:00
Jaex 07199f36cf Added nl-NL files to projects 2015-05-03 19:10:35 +03:00
Jaex 842b8139cb Twitter UI overhaul interim commit 2015-04-28 02:45:44 +03:00
Alan Edwardes ae89ebd8bc Added AWS SDK. Re-wrote S3 implementation to use pre-signed URLs for PUT. 2015-04-19 00:48:30 +01:00
Jaex 2e580e1b2a Added Spanish resx files to project 2015-04-08 22:57:25 +03:00
Jimin Park 304fabf304 Initial Korean translation completed.
I still need to revise translations and improve it, but basically every
strings are translated.
2015-04-02 11:51:36 +09:00
Jimin Park b8f77e2dfb Added Korean Translation for FFmpegOptions, ...
Also translations for FFMpeg, FTPClient, ....
2015-04-02 00:54:13 +09:00
Jimin Park 920d8a96ca Done some more Korean translations. 2015-04-01 23:31:44 +09:00
Jimin Park 490c17f376 Finished translating main ShareX project into KO.
Other projects like HelperLibs needs to be translated.
2015-04-01 22:59:01 +09:00
Jimin Park f72e9d6feb Added first Korean Translations 2015-04-01 12:35:05 +09:00
Jaex 9fd0710b53 fixed #549: Added vgy.me image uploader 2015-03-12 00:53:25 +02:00
Jaex ea80f46acc Added v.gd url shortener, Updated is.gd API usage 2015-02-24 07:59:07 +02:00
Jaex 37417ccbf2 Few Lambda changes 2015-02-03 22:48:32 +02:00
Marcus Stojcevich eadb52b3cb Add lambda.sx as a file uploader 2015-02-03 15:12:53 -05:00