beenull/SparkleShare
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
4513 commits 31 branches 6 tags 52 MiB
Commit graph

98 commits

Author SHA1 Message Date
Hylke Bons 8eb4fdf28f Fix some whitespace 2018-02-24 20:47:42 +00:00
Hylke Bons 65edbd26a6 repo git: Fix and tidy up log parsing 2018-02-24 20:38:46 +00:00
Hylke Bons c7cc2680aa
Merge pull request #1813 from hbons/fix/event-log 
fix/event-log
 2018-02-23 20:37:54 +00:00
Hylke Bons 89849b8014 sparkles git: Fix git log parsing for new versions of git 2018-02-23 20:23:46 +00:00
Hylke Bons 6b01821091 Bump version 2018-02-21 22:02:26 +00:00
Hylke Bons 7108fae2cf build: Fix System.Xml.Linq reference 2018-02-21 08:55:10 +00:00
Hylke Bons fcb1275325 Implement more of the meson build 2018-02-21 08:55:10 +00:00
Hylke Bons 72f3b5b8f9 Destroy autotools with fire 2018-02-21 08:55:10 +00:00
Hylke Bons 0a144e3fde build: Initial meson files 2018-02-21 08:54:29 +00:00
Hylke Bons cddaa86dba presets: Use Xml.Linq to write XML 2018-02-18 14:16:33 +00:00
Hylke Bons d5a7620683 config: Use Xml.Linq for writing XML 2018-02-18 14:06:14 +00:00
Hylke Bons 6514d71190 linux: Only use Gtk.ShowUri in flatpaks 2018-02-11 19:55:38 +00:00
Hylke Bons f46653ed9e logger: Keep a StreamWriter open to log, instead of opening+closing all the time 2018-01-22 12:03:08 +00:00
Hylke Bons e3ca5052f4 presets: Fix local presets path. Closes #1792 2018-01-06 12:24:33 +01:00
Hylke Bons 55048e1f7a Bump version to 2.0.1 2017-12-17 11:31:04 +01:00
Hylke Bons cf3b6a032e repo git: Mark unsynced changes to upload after conflict resolution 2017-12-16 18:17:16 +01:00
Hylke Bons c85074b573 repo git: Fix wrong conflicted version being recovered since migration from rebase to merge 2017-12-16 18:16:21 +01:00
Hylke Bons 8c8a5a460e git repo: Keep original plus both diverging versions on conflicts. Closes #1716 2017-12-16 17:56:13 +01:00
Hylke Bons f737a5bcc3 repo git: Move conflicted files to right subfolder. Fixes #1736 2017-12-16 14:52:38 +01:00
Hylke Bons 7aaf245675 Fix some whitespace 2017-09-25 22:10:33 +01:00
Hylke Bons 10bebccab6 Add todo to implement secure key store 2017-09-25 16:13:25 +01:00
Hylke Bons 36afea6993 mac: Lion is the minumum supported by Xamarin.Mac 2017-09-09 15:39:26 +01:00
Hylke Bons 653183df6a mac: Detect proper OS version and codename for logs 2017-09-09 15:22:49 +01:00
Hylke Bons 9f47ac91c4 sparkles: Disable notification service for now 2017-09-09 12:28:29 +01:00
Hylke Bons 1689ca8593 Change my email address 2017-07-23 13:47:54 +01:00
Jonathan Haines 5b34d2ff29 sparkles: Lazy Configuration Singleton on app startup 2017-04-20 23:15:20 +10:00
Hylke Bons c3da354abd Merge pull request #1757 from BarryThePenguin/windows-release 
windows: add debug and release configuration
 2017-04-17 09:47:35 +01:00
Hylke Bons f798b534e5 sparkles: Add whitespace 2017-04-17 08:50:31 +01:00
Jonathan Haines 93b5125b69 windows: add debug and release configuration 2017-04-16 14:11:38 +10:00
Hylke Bons 73f472e997 command: Move Git logic out of SSH and derive from SSH command 2017-04-15 12:19:50 +01:00
Hylke Bons 9c14020d43 linux: Fix build 2017-04-15 08:37:16 +01:00
Kévin LEMELE b88c11a7f3 Correct Sparkles.csproj compile source 2017-03-14 18:12:03 +01:00
Kévin LEMELE d299c78bc8 Removed unused import + format 2017-03-14 18:12:02 +01:00
Kévin LEMELE 4d68ae00d5 Rebase from master 2017-03-13 15:55:40 +01:00
Jonathan Haines a6908b607e windows 2017-03-13 15:45:47 +01:00
Hylke Bons a04a4df3ad fetcher git: Fix crash when no ID file in existing repo 2017-03-01 20:33:50 +00:00
Hylke Bons ee1a65cb68 repo git: Encrypt user names and emails in history 2017-02-03 01:06:20 +00:00
Hylke Bons 41b4fa390d repo git: Don't show commits by SparkleShare in history 2017-02-03 01:05:00 +00:00
Hylke Bons 91a3a79693 repo git: Resolve conflicts with SparkleShare as author 2017-02-03 01:03:01 +00:00
Hylke Bons 748c929844 extensions: Shorter salt size for AES 2017-02-02 23:19:27 +00:00
Hylke Bons 8fd165bd35 git fetcher: Define branch variables up front 2017-02-02 22:57:05 +00:00
Hylke Bons a6e6b99d25 git fetcher: Always make sure .git/info/ exists 2017-02-02 22:54:57 +00:00
Hylke Bons b70b40a8ff fetcher git: Don't add user info to initial commit 2017-02-02 22:53:57 +00:00
Hylke Bons 769eb45489 lib: Add AES crypto methods 2017-02-02 21:36:06 +00:00
Hylke Bons ff8575dbb3 Merge pull request #1729 from markusstoll/osx_debugging 
fix debugging on Xamarin@Mac/OSX
 2016-12-16 19:27:32 +01:00
jschaul b2b5295e6a Updated to use sha256 based key derivation 2016-12-12 20:29:35 +01:00
jschaul 18a71f1554 continue using md5 key derivation in openssl1.1 
See https://stackoverflow.com/questions/39637388/encryption-decryption-doesnt-work-well-between-two-different-openssl-versions/39641378#39641378 - Openssl changed their default digest algorithm from md5 to sha256 for the key derivation from password beginning with v1.1.0 (which, security wise, is a good thing!), but that creates compatibility issues if the version of openssl that encrypted a file is using a different digest than the version of openssl that decrypts files.
 2016-12-12 11:43:19 +01:00
Markus Stoll d339d77347 add debug Symbols for Debug configuration 
add DebugMac configuration for debugging on Mac / OSX
 2016-10-05 09:29:51 +02:00
Markus Stoll 471b999164 Release config for Mac 2016-09-26 21:53:57 +02:00
Hylke Bons d87b484d0f git fetcher: Update LFS description 2016-07-08 23:00:35 +01:00