Hylke Bons
|
d093894b2c
|
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
|
09878191d5
|
fix coding style
|
2013-01-06 15:58:11 +01:00 |
|
|
Hylke Bons
|
194e26500b
|
repo git: reduce the number of status commands being called on activity
|
2013-01-06 12:21:54 +01:00 |
|
|
Hylke Bons
|
bb8dda00f8
|
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
|
d3a04ed753
|
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
|
8239d940ca
|
Manually set locale to en-US for parsing numbers out of git output
|
2012-12-31 04:06:07 -06:00 |
|
|
Brandon Dahler
|
2a0588568c
|
Do not include /.git file in calculating subdirectory size
|
2012-12-25 00:32:39 -06:00 |
|
|
Hylke Bons
|
dd17c20373
|
git: adjust git-bin configuration to use sftp
|
2012-12-20 18:40:55 +01:00 |
|
|
Hylke Bons
|
097ea6f9ba
|
repo git: when things are utterly wrong, abandon rebase
|
2012-12-19 21:57:55 +01:00 |
|
|
Hylke Bons
|
bbd322a7d0
|
fix build
|
2012-12-18 18:05:06 +01:00 |
|
|
Hylke Bons
|
c98ff81dac
|
repo git: add more git-bin configuration on startup
|
2012-12-18 13:36:36 +01:00 |
|
|
Hylke Bons
|
c6a952233e
|
repo git: add private key info when using git-bin
|
2012-12-14 17:03:00 +01:00 |
|
|
Hylke Bons
|
a211521e79
|
repo git: when setting the url from config, also set the git-bin.sshUrl
|
2012-12-14 13:40:49 +01:00 |
|
|
Hylke Bons
|
b20bd558d7
|
mac: fix occasional crash when updating the menu whilst it's open
|
2012-12-04 23:51:32 +00:00 |
|
|
Hylke Bons
|
f61cef926b
|
various rearrangements and tweaks
|
2012-11-28 20:17:39 +00:00 |
|
|
Hylke Bons
|
5bc5186c2e
|
fetcher git: fix crypto. 'git branch -a' doesn't always show all branches
|
2012-11-27 21:57:05 +00:00 |
|
|
Hylke Bons
|
5fbbf973ed
|
repo: fix typo
|
2012-11-23 10:08:50 +00:00 |
|
|
Hylke Bons
|
1add1e2e84
|
repo statusicon: add error type: 'project not found'
|
2012-11-23 00:20:43 +00:00 |
|
|
Hylke Bons
|
fc33af3378
|
fetcher: log exceptions more cleanly
|
2012-11-22 12:32:04 +00:00 |
|
|
Hylke Bons
|
e947745fa1
|
repo git: fix parsing of changed host key error. #1078
|
2012-11-21 23:08:32 +00:00 |
|
|
Hylke Bons
|
1cce6f9b00
|
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
|
965278e189
|
repo git: fix getting stuck in conflict resolution loop when there are no conflicts
|
2012-11-20 20:33:02 +00:00 |
|
|
Hylke Bons
|
0494908972
|
repo git: reuse regex objects
|
2012-11-18 18:49:57 +00:00 |
|
|
Hylke Bons
|
d193f52af5
|
statusicon: start on a new thread when forcing a retry
|
2012-11-18 15:00:34 +00:00 |
|
|
Hylke Bons
|
1c36101212
|
statusicon: fix progress not appearing sometimes
|
2012-11-18 14:29:10 +00:00 |
|
|
Hylke Bons
|
90f161174f
|
repo git: catch any exceptions trying to parse transfer speeds
|
2012-11-18 11:36:09 +00:00 |
|
|
Hylke Bons
|
69cf6f690f
|
pass transfer speeds in bytes, not strings. report both directions when needed.
|
2012-11-17 23:05:29 +00:00 |
|
|
Hylke Bons
|
4bb41bf9f6
|
repo git: show error when we can't rebase due to locked files
|
2012-11-17 19:03:37 +00:00 |
|
|
Hylke Bons
|
aa71874b5a
|
repo git: don't abort rebase on startup, fix conflicts instead. fixes #1058
|
2012-11-16 10:05:57 +00:00 |
|
|
Hylke Bons
|
7c12a2f14f
|
repo git: always use the default repo branch, even if it's not master
|
2012-11-12 22:47:40 +00:00 |
|
|
Hylke Bons
|
9bcbec8d84
|
repo git: temporarily set core.ignorecase=true when rebasing to prevent conflicts. fixes #721
|
2012-11-11 19:15:42 +00:00 |
|
|
Hylke Bons
|
abe94a0bfc
|
fetcher git: explicitly set the push strategy. fixes #1035
|
2012-10-26 13:43:54 +01:00 |
|
|
Hylke Bons
|
acab0e1c85
|
repo git: cleanups
|
2012-10-22 21:41:00 +01:00 |
|
|
Hylke Bons
|
49a30a823b
|
windows: fix for the .sparkleshare file sometimes not being hidden
|
2012-10-21 21:16:38 +01:00 |
|
|
Hylke Bons
|
a4a48865dc
|
fetcher git: fixes for crypto setup
|
2012-10-20 23:22:41 +01:00 |
|
|
Hylke Bons
|
1009227aff
|
controller: small fix for status icon text not updating sometimes
|
2012-10-16 22:00:35 +01:00 |
|
|
Hylke Bons
|
2d3f351523
|
event log: show the last month worth of changes
|
2012-10-16 22:00:35 +01:00 |
|
|
Hylke Bons
|
8857634e64
|
eventlog: change default size
|
2012-10-16 22:00:35 +01:00 |
|
|
Hylke Bons
|
73d0f496d2
|
history: implement back button
|
2012-10-16 22:00:34 +01:00 |
|
|
Hylke Bons
|
3c74466898
|
history: fix some edge cases and general improvements
|
2012-10-16 22:00:34 +01:00 |
|
|
Hylke Bons
|
651033b9b8
|
make restoring of files work
|
2012-10-16 22:00:34 +01:00 |
|
|
Hylke Bons
|
d4ac1fe93e
|
early working version of history recycle logic + mac Save As dialog
|
2012-10-16 22:00:34 +01:00 |
|
|
Hylke Bons
|
a7c39b3a35
|
crypto: use a random salt per repo, store it as a remote branch name
|
2012-09-29 23:57:35 +02:00 |
|
|
Hylke Bons
|
34df1996cf
|
repo git: Fix endless loop when adding empty folders. Closes #967
|
2012-09-23 12:10:51 +01:00 |
|
|
Hylke Bons
|
4118f1949c
|
repo: don't allow multiple syncs at the same time on startup. Fixes #985
|
2012-09-22 22:43:40 +01:00 |
|
|
Hylke Bons
|
05101acf28
|
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
|
efd642253a
|
Fix bug from too large of commit log (introduced 1c8cffd178).
|
2012-09-21 19:27:26 -05:00 |
|
|
Hylke Bons
|
bb67a05e56
|
statusicon: On sync fail, add error descriptions as submenus. Closes #874
|
2012-09-18 19:40:06 +01:00 |
|
|
Hylke Bons
|
7c6e4c4980
|
repo git: set remote.origin.url from config.xml on startup. #972
|
2012-09-17 11:22:42 +01:00 |
|
|
Hylke Bons
|
e8f645147e
|
docs: Add howto to repo and use 'storage' as default user
|
2012-08-04 17:22:34 +02:00 |
|