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

30 commits

Author SHA1 Message Date
Hylke Bons 65edbd26a6 repo git: Fix and tidy up log parsing 2018-02-24 20:38:46 +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 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 1689ca8593 Change my email address 2017-07-23 13:47:54 +01: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 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 ac7e4cc7aa statusicon: Tweak status method logic 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 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 a7ff610aa7 Make Git LFS transfers work 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 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 c7a2e163b3 git: Pass auth info to objects that need it instead of global 2016-07-08 22:58:19 +01:00
Hylke Bons 6f826ba205 controller: Remove redundant method 2016-07-08 22:58:19 +01:00
Hylke Bons 996f2b2ce7 linux: Fix build 2016-07-08 22:58:19 +01:00
Hylke Bons b312620048 Rename SparkleLib to Sparkles 2016-07-08 22:58:19 +01:00
Renamed from SparkleLib/Git/GitRepository.cs (Browse further)