Hylke Bons
|
c98ff81dac
|
repo git: add more git-bin configuration on startup
|
2012-12-18 13:36:36 +01:00 |
|
Hylke Bons
|
07ced1bfa3
|
fetcher git: increase big file threshold
|
2012-12-14 19:13:30 +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
|
f3e3153d91
|
fetcher: compression exclude rules: tar is not compressed, add truecrypt volumes
|
2012-12-11 20:56:07 +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
|
187f4d3ad5
|
fetcher git: simplify
|
2012-11-22 09:46:49 +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
|
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
|
51d4b6a28c
|
fetcher git: typo in config setting
|
2012-11-08 16:02:55 +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
|
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
|
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
|
a02bd278b0
|
fetcher: fix support for http(s) repos. closes #1000
|
2012-10-05 21:55:57 +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 |
|
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
|
d790d1b003
|
fetcher git: Add .iso to do not compress list
|
2012-09-08 10:41:08 +01:00 |
|
Hylke Bons
|
caa79a9dca
|
fetcher git: check if git info directory exists before writing to it. Fixes #934
|
2012-08-27 13:54:22 +01:00 |
|
Leszek Krupinski
|
1f0635caf0
|
missing references
|
2012-08-13 11:22:12 +02:00 |
|
Leszek Krupinski
|
c592fb9016
|
Removed unnecessary entries causing warnings
|
2012-08-13 09:27:42 +02:00 |
|
Hylke Bons
|
0b4c4851c8
|
linux ui: change AssetsPath back to static
|
2012-08-11 23:01:07 +01:00 |
|
Hylke Bons
|
1f00cdceae
|
mac: fix solution file
|
2012-08-10 19:41:40 +01:00 |
|
Hylke Bons
|
e7e3b8603f
|
windows: Fix build. Closes #894
|
2012-08-10 19:04:11 +01:00 |
|
Hylke Bons
|
ded0595335
|
windows: Fix Windows build. Closes #882
|
2012-08-05 14:23:51 +02:00 |
|
Hylke Bons
|
e8f645147e
|
docs: Add howto to repo and use 'storage' as default user
|
2012-08-04 17:22:34 +02:00 |
|
Hylke Bons
|
c65e800d2e
|
Add backend support for listing history of a file and reverting
|
2012-08-04 00:32:44 +02:00 |
|
Hylke Bons
|
c9e4218358
|
Remove Helpers class, add Logger class
|
2012-07-28 15:58:09 +02:00 |
|
Hylke Bons
|
b4126d11b1
|
Fix log parse logic
|
2012-07-26 20:17:01 +02:00 |
|
Hylke Bons
|
5fddddbe21
|
build: cleanup and remove translations
|
2012-07-26 16:49:03 +02:00 |
|
Hylke Bons
|
e17cda8a38
|
build: move version number definition to central place, clean up build tools
|
2012-07-26 15:17:35 +02:00 |
|
Hylke Bons
|
ff89044289
|
repo git: Simplify
|
2012-07-26 12:43:16 +02:00 |
|
Hylke Bons
|
a90390b22f
|
lib git: simplify process starting
|
2012-07-26 12:30:00 +02:00 |
|
Hylke Bons
|
6ced798b3f
|
Fix build. Closes #876
|
2012-07-25 13:28:50 +02:00 |
|
Hylke Bons
|
34edbbb99e
|
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
|
5bef8dd3cc
|
fetcher: code cleanup
|
2012-07-22 22:54:59 +02:00 |
|
Hylke Bons
|
1d8e8eb810
|
Disable git-bin by default
|
2012-07-22 20:59:51 +02:00 |
|
Hylke Bons
|
d1eba721ca
|
repo git: code cleanup
|
2012-07-22 11:40:49 +02:00 |
|
Hylke Bons
|
d812c4c146
|
repo: move changeset list creation logic to base class
|
2012-07-19 22:21:38 +02:00 |
|
Hylke Bons
|
e8af571c2b
|
lib: code cleanup
|
2012-07-18 14:51:09 +02:00 |
|
Hylke Bons
|
3bd2630a13
|
git: Use the same Unicode form on all filesystems. Closes #478
|
2012-07-15 21:01:06 +02:00 |
|
Hylke Bons
|
0839657282
|
repo: remove unneeded try/catch block and fix up some logic
|
2012-07-14 17:18:29 +02:00 |
|
Hylke Bons
|
3496bfba75
|
Some rearrangements
|
2012-07-14 12:45:54 +02:00 |
|
Hylke Bons
|
e58bd78148
|
Disable git-bin
|
2012-07-08 12:49:17 +02:00 |
|
Hylke Bons
|
430b7f7a4b
|
fetcher git: show error messages when host key has changed
|
2012-07-08 12:30:37 +02:00 |
|
Hylke Bons
|
2122b79ab5
|
Allow renaming of folders. Closes #466
|
2012-07-06 11:26:02 +02:00 |
|
Hylke Bons
|
d244f12459
|
Calculate IDs in the fetcher and add the to the config
|
2012-07-05 13:38:55 +02:00 |
|
Matthias Dittrich
|
49fd14ebdb
|
Sparkle can now handle files with special characters
|
2012-07-05 13:37:18 +02:00 |
|
Hylke Bons
|
aa87519cc6
|
lib: style cleanups
|
2012-07-03 09:59:19 +02:00 |
|
Hylke Bons
|
08649a9aae
|
repo git: Use a more descriptive flag when calling git-log
|
2012-07-03 09:59:18 +02:00 |
|
Hylke Bons
|
34376dacf8
|
repo git: rewrite HasLocalChanges
|
2012-07-03 09:59:18 +02:00 |
|
Hylke Bons
|
cf84864911
|
repo git: catch IOException in ResolveConflict method
|
2012-07-03 09:59:18 +02:00 |
|
Hylke Bons
|
e439d53a7b
|
repo git: Fix conflict resolution
|
2012-07-03 09:59:18 +02:00 |
|
Hylke Bons
|
1c8cffd178
|
repo git: refactor andf fix Rebase and FormatCommitMessage methods
|
2012-07-03 09:59:18 +02:00 |
|
Hylke Bons
|
62c7a797f9
|
repo git: Remove some redundant lines
|
2012-07-03 09:59:18 +02:00 |
|
Matthias Dittrich
|
dc21e9a285
|
Now filesnames with special chars will be written properly in the comments
|
2012-07-03 09:59:18 +02:00 |
|
Hylke Bons
|
bb2a6b8662
|
lib git: Run commit with --all and deduplicate code somewhat
|
2012-07-03 09:59:18 +02:00 |
|
Hylke Bons
|
4ab153eb1f
|
repo git: Fix coding style for #823
|
2012-07-03 09:59:17 +02:00 |
|
Matthias Dittrich
|
b02d57d727
|
Found another place where the Utf8-fix is required
|
2012-07-03 09:59:17 +02:00 |
|
Matthias Dittrich
|
c5c63636e2
|
Sparkle can now handle files with special characters
|
2012-07-03 09:59:17 +02:00 |
|
Hylke Bons
|
618b0b520c
|
lib git: Clear git-bin cache after sync
|
2012-06-29 21:43:49 +01:00 |
|
Hylke Bons
|
8df73d9bee
|
lib git: only do remote_url check when needed
|
2012-06-29 17:08:12 +01:00 |
|
Hylke Bons
|
e320edfb7f
|
lib git: Add detection of git-bin repos
|
2012-06-29 16:44:02 +01:00 |
|
Hylke Bons
|
eb543fef5e
|
fetcher git: Refactor
|
2012-06-29 14:00:25 +01:00 |
|
Hylke Bons
|
a2353405dd
|
fetcher git: Simplify attributes file creation
|
2012-06-29 13:17:59 +01:00 |
|
Hylke Bons
|
7ebc93f40e
|
fetcher git: Simplify install of config after clone
|
2012-06-29 12:53:13 +01:00 |
|
Hylke Bons
|
a3d60412ee
|
lib: Add separate SparkleGit and SparkleGitBin objects derived from SparkleProcess
|
2012-06-29 00:12:37 +01:00 |
|
Hylke Bons
|
063b38ff28
|
repo git: hide .sparkleshare and .empty after a rebase. Fixes #814
|
2012-06-28 14:21:33 +01:00 |
|
Hylke Bons
|
8f95a38e26
|
fetcher git: don't read output on checkout and add --quiet option
|
2012-06-28 12:18:00 +01:00 |
|