Hylke Bons
|
afd7b76866
|
repo git: empty logs make me sad. always show something when no changes this month
|
2013-01-11 19:38:49 +01:00 |
|
Hylke Bons
|
8fd5974cad
|
Revert "Update from using AbsolutePath to LocalPath for all uris, fix some uri path combining."
This reverts commit b2b49012c1 .
Conflicts:
SparkleShare/SparkleControllerBase.cs
|
2013-01-06 19:33:55 +01:00 |
|
Hylke Bons
|
b2400bb5bc
|
fix coding style
|
2013-01-06 15:58:11 +01:00 |
|
Hylke Bons
|
c1d6289507
|
repo git: reduce the number of status commands being called on activity
|
2013-01-06 12:21:54 +01:00 |
|
Hylke Bons
|
3381e5a517
|
Merge branch 'PathFix' of https://github.com/brandondahler/SparkleShare
Conflicts:
SparkleShare/SparkleControllerBase.cs
|
2013-01-05 10:56:19 +01:00 |
|
Brandon Dahler
|
4ee5187c84
|
Update from using AbsolutePath to LocalPath for all uris, fix some uri path combining.
|
2013-01-05 02:38:01 -06:00 |
|
Hylke Bons
|
6d2852622f
|
git: fix typo. closes #1134
|
2013-01-03 22:13:18 +01:00 |
|
Hylke Bons
|
345b399b24
|
Search for git in the install dir, so people can add their custom copy of git. closes #1126
|
2013-01-03 13:34:47 +01:00 |
|
Hylke Bons
|
06840064b5
|
Merge pull request #1131 from brandondahler/CultureFix
Manually set locale to en-US for parsing numbers out of git output
|
2013-01-02 10:19:53 -08:00 |
|
Hylke Bons
|
8eed12ff30
|
Merge pull request #1122 from brandondahler/HistoryFix
Do not include /.git file in calculating subdirectory size
|
2013-01-02 06:09:24 -08:00 |
|
Brandon Dahler
|
75021f7444
|
Manually set locale to en-US for parsing numbers out of git output
|
2012-12-31 04:06:07 -06:00 |
|
Brandon Dahler
|
e01143389e
|
Do not include /.git file in calculating subdirectory size
|
2012-12-25 00:32:39 -06:00 |
|
Hylke Bons
|
829ce766f7
|
fetcher: ssh+backend strip should be in the derived class, not the base class. #1118
|
2012-12-21 22:02:35 +01:00 |
|
Hylke Bons
|
c7089c884e
|
git: adjust git-bin configuration to use sftp
|
2012-12-20 18:40:55 +01:00 |
|
Hylke Bons
|
268507d4d0
|
repo git: when things are utterly wrong, abandon rebase
|
2012-12-19 21:57:55 +01:00 |
|
Hylke Bons
|
93125e9e23
|
fix build
|
2012-12-18 18:05:06 +01:00 |
|
Hylke Bons
|
6daf9fd31c
|
repo git: add more git-bin configuration on startup
|
2012-12-18 13:36:36 +01:00 |
|
Hylke Bons
|
95ed386e05
|
fetcher git: increase big file threshold
|
2012-12-14 19:13:30 +01:00 |
|
Hylke Bons
|
7cf1e375e9
|
repo git: add private key info when using git-bin
|
2012-12-14 17:03:00 +01:00 |
|
Hylke Bons
|
cfc0011386
|
repo git: when setting the url from config, also set the git-bin.sshUrl
|
2012-12-14 13:40:49 +01:00 |
|
Hylke Bons
|
bc1c5d21b2
|
fetcher: compression exclude rules: tar is not compressed, add truecrypt volumes
|
2012-12-11 20:56:07 +01:00 |
|
Hylke Bons
|
3450354f12
|
mac: fix occasional crash when updating the menu whilst it's open
|
2012-12-04 23:51:32 +00:00 |
|
Hylke Bons
|
aea3176846
|
various rearrangements and tweaks
|
2012-11-28 20:17:39 +00:00 |
|
Hylke Bons
|
c45d883728
|
fetcher git: fix crypto. 'git branch -a' doesn't always show all branches
|
2012-11-27 21:57:05 +00:00 |
|
Hylke Bons
|
f5463f98ba
|
repo: fix typo
|
2012-11-23 10:08:50 +00:00 |
|
Hylke Bons
|
63fde5a7d9
|
repo statusicon: add error type: 'project not found'
|
2012-11-23 00:20:43 +00:00 |
|
Hylke Bons
|
0c3905e58a
|
fetcher: log exceptions more cleanly
|
2012-11-22 12:32:04 +00:00 |
|
Hylke Bons
|
a5ea281c04
|
fetcher git: simplify
|
2012-11-22 09:46:49 +00:00 |
|
Hylke Bons
|
804b390eba
|
repo git: fix parsing of changed host key error. #1078
|
2012-11-21 23:08:32 +00:00 |
|
Hylke Bons
|
cd6f69ef43
|
repo git: don't try to resolve conflicts when a rebase failed due to locked files
|
2012-11-21 09:22:55 +00:00 |
|
Hylke Bons
|
8948837a59
|
repo git: fix getting stuck in conflict resolution loop when there are no conflicts
|
2012-11-20 20:33:02 +00:00 |
|
Hylke Bons
|
cdf28e8d20
|
repo git: reuse regex objects
|
2012-11-18 18:49:57 +00:00 |
|
Hylke Bons
|
278a1df06d
|
statusicon: start on a new thread when forcing a retry
|
2012-11-18 15:00:34 +00:00 |
|
Hylke Bons
|
8e1c79226e
|
statusicon: fix progress not appearing sometimes
|
2012-11-18 14:29:10 +00:00 |
|
Hylke Bons
|
2e73338337
|
repo git: catch any exceptions trying to parse transfer speeds
|
2012-11-18 11:36:09 +00:00 |
|
Hylke Bons
|
6015950fc5
|
pass transfer speeds in bytes, not strings. report both directions when needed.
|
2012-11-17 23:05:29 +00:00 |
|
Hylke Bons
|
7c71c3d67f
|
repo git: show error when we can't rebase due to locked files
|
2012-11-17 19:03:37 +00:00 |
|
Hylke Bons
|
7165cc7cae
|
repo git: don't abort rebase on startup, fix conflicts instead. fixes #1058
|
2012-11-16 10:05:57 +00:00 |
|
Hylke Bons
|
94c1354a70
|
repo git: always use the default repo branch, even if it's not master
|
2012-11-12 22:47:40 +00:00 |
|
Hylke Bons
|
c60153b90c
|
repo git: temporarily set core.ignorecase=true when rebasing to prevent conflicts. fixes #721
|
2012-11-11 19:15:42 +00:00 |
|
Hylke Bons
|
9e89a92ba7
|
remove GNOME plugin as it isn't actually used by anyone
|
2012-11-10 22:00:03 +00:00 |
|
Hylke Bons
|
b73f422a99
|
fetcher git: add back warning about global gitignore
|
2012-11-10 12:26:47 +00:00 |
|
Hylke Bons
|
3a13cad422
|
fetcher git: explicitly convert to native line endings for .txt files (for Notepad)
|
2012-11-10 10:43:30 +00:00 |
|
Hylke Bons
|
ae90c616b2
|
fetcher git: typo in config setting
|
2012-11-08 16:02:55 +00:00 |
|
Hylke Bons
|
d79f093996
|
fetcher git: explicitly set the push strategy. fixes #1035
|
2012-10-26 13:43:54 +01:00 |
|
Hylke Bons
|
e4d8e88deb
|
repo git: cleanups
|
2012-10-22 21:41:00 +01:00 |
|
Hylke Bons
|
9601506d31
|
windows: fix for the .sparkleshare file sometimes not being hidden
|
2012-10-21 21:16:38 +01:00 |
|
Hylke Bons
|
c274e87019
|
fetcher git: fixes for crypto setup
|
2012-10-20 23:22:41 +01:00 |
|
Hylke Bons
|
d80abc3070
|
fetcher git: fix crypto salt lookup
|
2012-10-19 23:42:27 +01:00 |
|
Hylke Bons
|
3a8d7bec4f
|
controller: small fix for status icon text not updating sometimes
|
2012-10-16 22:00:35 +01:00 |
|
Hylke Bons
|
2c94a9938d
|
event log: show the last month worth of changes
|
2012-10-16 22:00:35 +01:00 |
|
Hylke Bons
|
423717bd1d
|
eventlog: change default size
|
2012-10-16 22:00:35 +01:00 |
|
Hylke Bons
|
a20d377192
|
history: implement back button
|
2012-10-16 22:00:34 +01:00 |
|
Hylke Bons
|
6f22466eac
|
history: fix some edge cases and general improvements
|
2012-10-16 22:00:34 +01:00 |
|
Hylke Bons
|
ef44b2ccfb
|
make restoring of files work
|
2012-10-16 22:00:34 +01:00 |
|
Hylke Bons
|
da0f3d53a5
|
early working version of history recycle logic + mac Save As dialog
|
2012-10-16 22:00:34 +01:00 |
|
Hylke Bons
|
a406a0964d
|
fetcher: fix support for http(s) repos. closes #1000
|
2012-10-05 21:55:57 +02:00 |
|
Hylke Bons
|
475b82f43a
|
crypto: use a random salt per repo, store it as a remote branch name
|
2012-09-29 23:57:35 +02:00 |
|
Hylke Bons
|
9a7b5b8827
|
repo git: Fix endless loop when adding empty folders. Closes #967
|
2012-09-23 12:10:51 +01:00 |
|
Hylke Bons
|
0286060d9a
|
repo: don't allow multiple syncs at the same time on startup. Fixes #985
|
2012-09-22 22:43:40 +01:00 |
|
Hylke Bons
|
321efb4384
|
Merge pull request #984 from brandondahler/master
Too large commit log causes git to hang
|
2012-09-22 05:37:34 -07:00 |
|
Brandon Dahler
|
c440b70fa2
|
Fix bug from too large of commit log (introduced 1c8cffd178 ).
|
2012-09-21 19:27:26 -05:00 |
|
Hylke Bons
|
cb5617c300
|
statusicon: On sync fail, add error descriptions as submenus. Closes #874
|
2012-09-18 19:40:06 +01:00 |
|
Hylke Bons
|
284234514f
|
repo git: set remote.origin.url from config.xml on startup. #972
|
2012-09-17 11:22:42 +01:00 |
|
Hylke Bons
|
16446ff566
|
fetcher git: Add .iso to do not compress list
|
2012-09-08 10:41:08 +01:00 |
|
Hylke Bons
|
f6dc8fb3bb
|
fetcher git: check if git info directory exists before writing to it. Fixes #934
|
2012-08-27 13:54:22 +01:00 |
|
Leszek Krupinski
|
00971c8ddd
|
missing references
|
2012-08-13 11:22:12 +02:00 |
|
Leszek Krupinski
|
d443b1c6a0
|
Removed unnecessary entries causing warnings
|
2012-08-13 09:27:42 +02:00 |
|
Hylke Bons
|
18a98dc69b
|
linux ui: change AssetsPath back to static
|
2012-08-11 23:01:07 +01:00 |
|
Hylke Bons
|
ed5074aae0
|
mac: fix solution file
|
2012-08-10 19:41:40 +01:00 |
|
Hylke Bons
|
ae3495d388
|
windows: Fix build. Closes #894
|
2012-08-10 19:04:11 +01:00 |
|
Hylke Bons
|
448599e661
|
windows: Fix Windows build. Closes #882
|
2012-08-05 14:23:51 +02:00 |
|
Hylke Bons
|
e18c72c099
|
docs: Add howto to repo and use 'storage' as default user
|
2012-08-04 17:22:34 +02:00 |
|
Hylke Bons
|
f9e57dba0a
|
Add backend support for listing history of a file and reverting
|
2012-08-04 00:32:44 +02:00 |
|
Hylke Bons
|
161bfea8b4
|
Remove Helpers class, add Logger class
|
2012-07-28 15:58:09 +02:00 |
|
Hylke Bons
|
5e9d260409
|
Fix log parse logic
|
2012-07-26 20:17:01 +02:00 |
|
Hylke Bons
|
5290414866
|
build: cleanup and remove translations
|
2012-07-26 16:49:03 +02:00 |
|
Hylke Bons
|
2b4843ad24
|
build: move version number definition to central place, clean up build tools
|
2012-07-26 15:17:35 +02:00 |
|
Hylke Bons
|
744dcc4483
|
repo git: Simplify
|
2012-07-26 12:43:16 +02:00 |
|
Hylke Bons
|
942752f2e9
|
lib git: simplify process starting
|
2012-07-26 12:30:00 +02:00 |
|
Hylke Bons
|
351ad0df92
|
Fix build. Closes #876
|
2012-07-25 13:28:50 +02:00 |
|
Hylke Bons
|
687cbd4b60
|
lib: Check if we're in the middle on a rebase on startup, if so: abort
|
2012-07-25 11:41:51 +02:00 |
|
Hylke Bons
|
0b500c3ef4
|
fetcher: code cleanup
|
2012-07-22 22:54:59 +02:00 |
|
Hylke Bons
|
ce844af1ee
|
Disable git-bin by default
|
2012-07-22 20:59:51 +02:00 |
|
Hylke Bons
|
471be2cd9f
|
repo git: code cleanup
|
2012-07-22 11:40:49 +02:00 |
|
Hylke Bons
|
126d696d5a
|
repo: move changeset list creation logic to base class
|
2012-07-19 22:21:38 +02:00 |
|
Hylke Bons
|
f3784ddc98
|
lib: code cleanup
|
2012-07-18 14:51:09 +02:00 |
|
Hylke Bons
|
accf447456
|
git: Use the same Unicode form on all filesystems. Closes #478
|
2012-07-15 21:01:06 +02:00 |
|
Hylke Bons
|
e61e33b47f
|
repo: remove unneeded try/catch block and fix up some logic
|
2012-07-14 17:18:29 +02:00 |
|
Hylke Bons
|
eaead8c87d
|
Some rearrangements
|
2012-07-14 12:45:54 +02:00 |
|
Hylke Bons
|
f209602f3a
|
Disable git-bin
|
2012-07-08 12:49:17 +02:00 |
|
Hylke Bons
|
a7d926b6fa
|
fetcher git: show error messages when host key has changed
|
2012-07-08 12:30:37 +02:00 |
|
Hylke Bons
|
ec2f5f36a2
|
Allow renaming of folders. Closes #466
|
2012-07-06 11:26:02 +02:00 |
|
Hylke Bons
|
c769f6c7a8
|
Calculate IDs in the fetcher and add the to the config
|
2012-07-05 13:38:55 +02:00 |
|
Matthias Dittrich
|
404ee662ac
|
Sparkle can now handle files with special characters
|
2012-07-05 13:37:18 +02:00 |
|
Hylke Bons
|
22fcca2fac
|
lib: style cleanups
|
2012-07-03 09:59:19 +02:00 |
|
Hylke Bons
|
c03bbc2fa1
|
repo git: Use a more descriptive flag when calling git-log
|
2012-07-03 09:59:18 +02:00 |
|
Hylke Bons
|
9692ca655e
|
repo git: rewrite HasLocalChanges
|
2012-07-03 09:59:18 +02:00 |
|
Hylke Bons
|
aeafa39c0d
|
repo git: catch IOException in ResolveConflict method
|
2012-07-03 09:59:18 +02:00 |
|
Hylke Bons
|
f28dfd0318
|
repo git: Fix conflict resolution
|
2012-07-03 09:59:18 +02:00 |
|