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
|
3774f3cde6
|
clean up
|
2012-11-19 15:06:56 +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
|
f303f938c4
|
bump version to 0.9.8
|
2012-11-11 21:33:57 +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
|
aabf323860
|
remove GNOME plugin as it isn't actually used by anyone
|
2012-11-10 22:00:03 +00:00 |
|
Hylke Bons
|
f4c6e50a15
|
fetcher git: add back warning about global gitignore
|
2012-11-10 12:26:47 +00:00 |
|
Hylke Bons
|
ac2066f7f4
|
fetcher git: explicitly convert to native line endings for .txt files (for Notepad)
|
2012-11-10 10:43:30 +00:00 |
|
Hylke Bons
|
ef6df58f5c
|
bump version to 0.9.7
|
2012-11-09 19:25:09 +00:00 |
|
Hylke Bons
|
51d4b6a28c
|
fetcher git: typo in config setting
|
2012-11-08 16:02:55 +00:00 |
|
Hylke Bons
|
821d93d672
|
fix repos with '.git' in their name not syncing sometimes
|
2012-11-04 18:37:38 +00:00 |
|
Hylke Bons
|
cdfda1256f
|
fetcher: use different way to determine repo backend to fix a crash on windows
|
2012-11-04 18:20:01 +00:00 |
|
Hylke Bons
|
285b8082bc
|
fetcher: make Snet repos use client side crypto by default
|
2012-11-04 17:43:29 +00:00 |
|
Hylke Bons
|
bd746ba2c0
|
Allow using periods '.' and underscores '_' (will be replaced by spaces locally) in project names. fixes #1046
|
2012-11-04 16:27:39 +00:00 |
|
Hylke Bons
|
4a570d50d0
|
fetcher: create a different SparkleShare.txt message for encrypted projects
|
2012-11-02 16:09:05 +00:00 |
|
Hylke Bons
|
2bcf22cd0d
|
bump version
|
2012-10-26 23:54:53 +01:00 |
|
Hylke Bons
|
af626eb1e8
|
setup mac: change the last tutorial page. present link code with copy button
|
2012-10-26 23:26:15 +01:00 |
|
Hylke Bons
|
abe94a0bfc
|
fetcher git: explicitly set the push strategy. fixes #1035
|
2012-10-26 13:43:54 +01:00 |
|
Hylke Bons
|
164c420989
|
repo: when adding files during a sync, don't trigger a new sync but wait when idle
|
2012-10-25 16:23:59 +01:00 |
|
Hylke Bons
|
acab0e1c85
|
repo git: cleanups
|
2012-10-22 21:41:00 +01:00 |
|
Hylke Bons
|
cb7872778b
|
logger: add exception type to crash dump
|
2012-10-22 10:03:59 +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
|
9571043aba
|
bump version
|
2012-10-20 23:51:50 +01:00 |
|
Hylke Bons
|
e5f967dcbc
|
convert tabs to space
|
2012-10-20 23:25:36 +01:00 |
|
Hylke Bons
|
a4a48865dc
|
fetcher git: fixes for crypto setup
|
2012-10-20 23:22:41 +01:00 |
|
Hylke Bons
|
d8cb07763f
|
windows: fix version number in about dialog. closes #1021
|
2012-10-20 18:53:31 +01:00 |
|
Hylke Bons
|
6ffda9388b
|
fetcher git: fix crypto salt lookup
|
2012-10-19 23:42:27 +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
|
96bf4efc7a
|
fetcher: hide the .sparkleshare file when done
|
2012-10-16 22:00:35 +01:00 |
|
Hylke Bons
|
faf5ff12c1
|
don't block the event log on initial startup syncs
|
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
|
69e79d1ca6
|
bump development version
|
2012-10-16 22:00:34 +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
|
f20561598d
|
update Bitbucket logo to their new brand. add sources for other default host icons
|
2012-10-09 23:12:35 +02:00 |
|
Hylke Bons
|
713950c37e
|
eventlog: take user to gravatar.com when clicking on avatars
|
2012-10-06 13:17:39 +02:00 |
|
Hylke Bons
|
a02bd278b0
|
fetcher: fix support for http(s) repos. closes #1000
|
2012-10-05 21:55:57 +02:00 |
|
Hylke Bons
|
570c0eb17f
|
fetcher: simplify some methods
|
2012-10-04 18:54:16 +02:00 |
|
Hylke Bons
|
1a3e7da738
|
eventlog: fix first commit on encrypted repos
|
2012-09-30 13:07:36 +02: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 |
|