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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|