Hylke Bons
|
0a144e3fde
|
build: Initial meson files
|
2018-02-21 08:54:29 +00: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
|
1689ca8593
|
Change my email address
|
2017-07-23 13:47:54 +01: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 |
|
Kévin LEMELE
|
d299c78bc8
|
Removed unused import + format
|
2017-03-14 18:12:02 +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
|
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
|
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 |
|
|
Hylke Bons
|
70704adade
|
git fetcher: Always pass storage type when completing
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
ac7e4cc7aa
|
statusicon: Tweak status method logic
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
20e4ebb970
|
git: Take skipped files into account for progress
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
d40c2c12a0
|
git fetcher: Actually trigger progress event
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
a9cd7c825d
|
fetcher: Fix storage type detection and progress
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
cbd77a197c
|
git repo: Make sure hooks path exists before writing to it
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
a6c57e51b7
|
git: Simplify progress parsing and support LFS
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
8ab758ccda
|
git fetcher: Implement LFS progress reporting
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
bc5698a6cc
|
git: Depend on a git-lfs binary in a fixed location
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
cde01d1166
|
mac: Git LFS support by hardcoding paths to binary
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
3647be1a9a
|
git command: whitespace
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
e2b41ece50
|
mac: Add LFS detection
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
a0d3edc8f8
|
git command: Fix exec path var not being set
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
3a98e968c3
|
repo git: Make restore from history work on all storage types
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
6716f1dcce
|
Make Git LFS work properly
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
b6fe147df6
|
fetcher git: Treat all files as binary
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
a7ff610aa7
|
Make Git LFS transfers work
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
e5f109eddb
|
git fetcher: Fix resolving conflicts in encrypted files
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
205fde5fc8
|
git: Implement encryption feature using new storage types
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
1e37ba0992
|
Progress on LFS support
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
ea9c4a53dd
|
git fetcher: Set required property for encryption filter
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
b79c3ea3d0
|
Add initial support for different storage types
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
bfdb72194c
|
sparkles: Add Git LFS support
|
2016-07-08 23:00:35 +01:00 |
|
|
Hylke Bons
|
6e16361c8f
|
List GitLFS version
|
2016-07-08 23:00:35 +01:00 |
|