Commit graph

8737 commits

Author SHA1 Message Date
Hylke Bons
ee1a65cb68 repo git: Encrypt user names and emails in history 2017-02-03 01:06:20 +00:00
Hylke Bons
6e5be544de repo git: Don't show commits by SparkleShare in history 2017-02-03 01:05:00 +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
019721aaf1 repo git: Resolve conflicts with SparkleShare as author 2017-02-03 01:03:01 +00:00
Hylke Bons
91a3a79693 repo git: Resolve conflicts with SparkleShare as author 2017-02-03 01:03:01 +00:00
Hylke Bons
48930cb74b extensions: Shorter salt size for AES 2017-02-02 23:19:27 +00:00
Hylke Bons
748c929844 extensions: Shorter salt size for AES 2017-02-02 23:19:27 +00:00
Hylke Bons
26406c96ff git fetcher: Define branch variables up front 2017-02-02 22:57:05 +00:00
Hylke Bons
8fd165bd35 git fetcher: Define branch variables up front 2017-02-02 22:57:05 +00:00
Hylke Bons
b917aca13f git fetcher: Always make sure .git/info/ exists 2017-02-02 22:54:57 +00:00
Hylke Bons
a6e6b99d25 git fetcher: Always make sure .git/info/ exists 2017-02-02 22:54:57 +00:00
Hylke Bons
944604611d fetcher git: Don't add user info to initial commit 2017-02-02 22:53: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
7fead7d8a5 lib: Add AES crypto methods 2017-02-02 21:36:06 +00:00
Hylke Bons
769eb45489 lib: Add AES crypto methods 2017-02-02 21:36:06 +00:00
Hylke Bons
5a98a8b1a1 mac: No need for launch args to be public static 2016-11-06 11:35:53 +00:00
Hylke Bons
d997a04f7a mac: No need for launch args to be public static 2016-11-06 11:35:53 +00:00
Hylke Bons
a113801b2b Update News.txt 2016-11-06 11:35:15 +00:00
Hylke Bons
32c5117c34 Merge pull request #1729 from markusstoll/osx_debugging
fix debugging on Xamarin@Mac/OSX
2016-12-16 19:27:32 +01:00
Hylke Bons
13a51fbb11 Merge pull request #1740 from jschaul/workaround/continue-using-md5-key-derivation-in-openssl1.1
force using sha256 key derivation in openssl prior to v1.1.0
2016-12-16 19:02:56 +01:00
jschaul
39d38b37df Updated to use sha256 based key derivation 2016-12-12 20:29:35 +01:00
jschaul
dd5f2320c7 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
Hylke Bons
c3f96e2178 Merge pull request #1739 from snwh/master
updated linux app icon
2016-12-08 16:06:59 +00:00
Sam Hewitt
6b855e295e fixed star brightness 2016-12-08 10:50:07 -05:00
Sam Hewitt
653a82a9cb updated linux app icon
Original icon was based on the GNOME/Adwaita folder set, updated the SparkleShare icons to match the latest version of that set
2016-12-08 10:26:15 -05:00
Hylke Bons
3cc74f096d Update News.txt 2016-11-06 11:35:15 +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
Hylke Bons
9f0a1fa303 Merge pull request #1740 from jschaul/workaround/continue-using-md5-key-derivation-in-openssl1.1
force using sha256 key derivation in openssl prior to v1.1.0
2016-12-16 19:02:56 +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
Hylke Bons
9d3ef12f06 Merge pull request #1739 from snwh/master
updated linux app icon
2016-12-08 16:06:59 +00:00
Sam Hewitt
880ee55054 fixed star brightness 2016-12-08 10:50:07 -05:00
Sam Hewitt
b69ed15e95 updated linux app icon
Original icon was based on the GNOME/Adwaita folder set, updated the SparkleShare icons to match the latest version of that set
2016-12-08 10:26:15 -05:00
Markus Stoll
74e15ba4fa add debug Symbols for Debug configuration
add DebugMac configuration for debugging on Mac / OSX
2016-10-05 09:29:51 +02: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
Hylke Bons
c8b6c0de90 Merge pull request #1726 from markusstoll/master
Release config for Mac
2016-09-29 09:30:35 +01:00
Hylke Bons
4fa7a81dd4 Merge pull request #1726 from markusstoll/master
Release config for Mac
2016-09-29 09:30:35 +01:00
Markus Stoll
95ddec68af ingnore git build stuff 2016-09-29 09:47:08 +02:00
Markus Stoll
80241a4355 ingnore git build stuff 2016-09-29 09:47:08 +02:00
Markus Stoll
1b28672856 use git version that compiles on osx 2016-09-28 16:08:13 +02:00
Markus Stoll
392b29dbfb use git version that compiles on osx 2016-09-28 16:08:13 +02:00
Markus Stoll
b50375ed3e Release config for Mac 2016-09-26 21:53:57 +02:00
Markus Stoll
471b999164 Release config for Mac 2016-09-26 21:53:57 +02:00
Hylke Bons
1513219a1e Merge pull request #1722 from paul-hammant/master
font not available on El Capitan
2016-09-08 09:12:33 +01:00
Hylke Bons
ed06e9c2b7 Merge pull request #1722 from paul-hammant/master
font not available on El Capitan
2016-09-08 09:12:33 +01:00
Paul Hammant
06b0b6ab06 font not available on El Capitan 2016-09-08 03:15:50 -04:00
Paul Hammant
04523a74d9 font not available on El Capitan 2016-09-08 03:15:50 -04:00
Hylke Bons
f22758a2e9 linux autostart: xdg-app -> flatpak 2016-09-03 19:41:23 +01:00
Hylke Bons
9d0afd6df1 linux autostart: xdg-app -> flatpak 2016-09-03 19:41:23 +01:00
Hylke Bons
0958959b7e Merge pull request #1717 from ph-hs/master
Git version files accidentally .ignored in prior commit (broken Mac build presently)
2016-08-21 20:25:27 +01:00