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
1db08602e6
linux: Update project file locations
2017-03-12 23:40:55 +00:00
Hylke Bons
5bb81033a1
build: Clean up autogenerated files
2017-03-12 15:41:08 +00:00
Hylke Bons
9f7c638b16
linux: Fix build
2017-03-12 15:41:08 +00:00
Hylke Bons
22a7419c40
build: Always build the current branch
...
travis: Fix source path copy
2017-03-12 15:41:08 +00:00
Hylke Bons
690b82c4a8
mac: Comment build script
2017-03-12 15:41:08 +00:00
Hylke Bons
88c4986113
Use a shared project for common source files
2017-03-12 15:41:08 +00: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
0a7fcb1834
linux: Update readme
2017-02-21 18:36:23 +00:00
Hylke Bons
89a36a6383
linux ui: Fix build
2017-02-21 18:28:32 +00:00
Hylke Bons
3a9496a90e
Add Travis CI badge to readme
2017-02-21 18:27:47 +00:00
Hylke Bons
72dee067ff
build: Add Travis CI for Linux
2017-02-21 18:26:57 +00:00
Hylke Bons
4e50d51a12
linux: Fix build on Ubuntu
2017-02-21 00:26:05 +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
d997a04f7a
mac: No need for launch args to be public static
2016-11-06 11:35:53 +00: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
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
4fa7a81dd4
Merge pull request #1726 from markusstoll/master
...
Release config for Mac
2016-09-29 09:30:35 +01:00
Markus Stoll
80241a4355
ingnore git build stuff
2016-09-29 09:47:08 +02:00
Markus Stoll
392b29dbfb
use git version that compiles on osx
2016-09-28 16:08:13 +02:00
Markus Stoll
471b999164
Release config for Mac
2016-09-26 21:53:57 +02: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
04523a74d9
font not available on El Capitan
2016-09-08 03:15:50 -04:00
Hylke Bons
9d0afd6df1
linux autostart: xdg-app -> flatpak
2016-09-03 19:41:23 +01:00
Hylke Bons
5cd31a397d
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
Paul Hammant
a22a4d4175
oops, file missing from a prior commit
2016-08-21 14:43:52 -04:00
Hylke Bons
2f2e4b79b9
Merge pull request #1715 from andrewshadura/master
...
Two more changes to configure.
2016-08-16 19:38:25 +01:00
Andrew Shadura
fa1fb80c87
configure: Cosmetic whitespace changes.
...
Use tabs everywhere, reindent PKGCONFIG bits.
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
2016-08-16 18:32:25 +01:00
Andrew Shadura
e4e1616159
configure: Don't use ancient and confusing shell syntax
...
Prepending "x" to test arguments isn't needed if proper
quoting is used; POSIX is pretty clear on that.
This confusing x prefix has also masked a bug on line 99,
where a condition was never true due to a missing x on
the right side of the comparison.
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
2016-08-16 18:26:14 +01:00
Hylke Bons
16038b3896
Merge pull request #1714 from andrewshadura/master
...
Fix autoconf and automake files
2016-08-16 18:25:45 +01:00
Andrew Shadura
dff13408f8
makefiles: Don't define system_themedir twice
...
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
2016-08-16 18:12:24 +01:00
Thanh Tung Nguyen
ca12a07896
makefiles: Use a separate variable for tests link flags
...
Signed-off-by: Thanh Tung Nguyen <thngtong@gmail.com>
[rebased to the latest upstream code]
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
2016-08-16 18:12:13 +01:00
Jo Shields
3458ee2893
configure: Support and use Mono 4.5 compiler
...
Signed-off-by: Jo Shields <directhex@apebox.org>
[adjusted the patch to the new upstream build code]
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
2016-08-16 18:03:00 +01:00
Andrew Shadura
d993fb322a
configure: Update paths to the autogenerated Makefiles.
...
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
2016-08-16 18:02:57 +01:00
Thanh Tung Nguyen
48d5e25d03
configure: Add the m4 macros directories correctly.
...
Signed-off-by: Thanh Tung Nguyen <thngtong@gmail.com>
[rebased, reworded the commit message]
Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk>
2016-08-16 18:02:39 +01:00