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
Hylke Bons
f3784ddc98
lib: code cleanup
2012-07-18 14:51:09 +02:00
Hylke Bons
eaead8c87d
Some rearrangements
2012-07-14 12:45:54 +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
Hylke Bons
a7b0e775e0
repo git: refactor andf fix Rebase and FormatCommitMessage methods
2012-07-03 09:59:18 +02:00
Hylke Bons
b3040b5276
repo git: Remove some redundant lines
2012-07-03 09:59:18 +02:00
Matthias Dittrich
288317a8bb
Now filesnames with special chars will be written properly in the comments
2012-07-03 09:59:18 +02:00
Hylke Bons
aa9af2c094
lib git: Run commit with --all and deduplicate code somewhat
2012-07-03 09:59:18 +02:00
Hylke Bons
ef196d00b8
repo git: Fix coding style for #823
2012-07-03 09:59:17 +02:00
Matthias Dittrich
0be8c17a05
Found another place where the Utf8-fix is required
2012-07-03 09:59:17 +02:00
Matthias Dittrich
02487a466b
Sparkle can now handle files with special characters
2012-07-03 09:59:17 +02:00
Hylke Bons
91fdb44445
lib git: Clear git-bin cache after sync
2012-06-29 21:43:49 +01:00
Hylke Bons
865525dee2
lib git: only do remote_url check when needed
2012-06-29 17:08:12 +01:00
Hylke Bons
9dc0b6af5b
lib git: Add detection of git-bin repos
2012-06-29 16:44:02 +01:00
Hylke Bons
799314ceee
lib: Add separate SparkleGit and SparkleGitBin objects derived from SparkleProcess
2012-06-29 00:12:37 +01:00
Hylke Bons
4bef356142
repo git: hide .sparkleshare and .empty after a rebase. Fixes #814
2012-06-28 14:21:33 +01:00
Hylke Bons
349410927a
repo git: don't resolve conflicts on the .sparkleshare file. See #807
2012-06-27 00:13:17 +01:00
Hylke Bons
330e80c22b
repo git: reuse git objects
2012-06-24 23:20:45 +01:00
Hylke Bons
4bee67b3d5
git: return to setting author on local repository, specifying in the command causes issues. Fixes #678
2012-06-24 19:14:52 +01:00
Hylke Bons
4c945e5611
lib: add folder name to debug info for each git call. Closes #796
2012-06-21 17:58:07 +01:00
Hylke Bons
090a34a3c7
lib git: treat merge commits like any other commit
2012-06-19 10:54:46 +01:00
Hylke Bons
6d796f35bf
make
2012-06-17 21:56:27 +01:00
Hylke Bons
febd993f29
Refactor adding of (empty) repos. Fixes #773
2012-06-10 23:56:39 +01:00
Hylke Bons
fccb790a2d
repo: Simplify watch toggling mechanism
2012-06-10 11:03:03 +01:00
Hylke Bons
fe3f28d7c4
Tweak some debug output
2012-06-09 16:27:34 +01:00
Carlos Martín Nieto
a7e24dc3aa
SparkleLib: Use rev-parse HEAD to determine latest commit
...
While `git log -1 --format=%H` does show the same data, it needs to
start up the revision walking machinery just to show the latest
commit's hash. `git rev-parse HEAD` tells us this commit's hash
without doing all the extra work.
2012-06-07 15:42:59 +02:00
Hylke Bons
43703b94f8
repo git: only squash commits by the same person
2012-05-28 00:14:00 +01:00
Hylke Bons
e1c16f0f5f
eventlog: sort changes by timestamp, not type
2012-05-27 19:24:12 +01:00
Hylke Bons
ea432c32e8
repo git: catch exceptions creating .empty files. Fixes #733
2012-05-20 12:51:09 +01:00
Hylke Bons
1a97616e38
repo: Fix edge case where ID may be empty
2012-05-19 16:15:20 +01:00
Hylke Bons
9800bcf421
Cache changesets in the backend
2012-04-29 15:19:36 +01:00
Hylke Bons
b230d14d4a
Add SparkleShare.txt and .sparkleshare in a single commit
2012-04-26 16:02:59 +02:00
Hylke Bons
b087fde663
Implement encryption using OpenSSL's AES + Mac UI
2012-04-26 16:02:58 +02:00
Hylke Bons
145e8fe01d
repo git: Don't follow symlinks when preparing the tree. Fixes #701
2012-04-17 19:00:05 +02:00
Hylke Bons
5829bf4622
git: write error outputs to the debug.log for easier debugging
2012-04-17 11:05:51 +02:00
Hylke Bons
d542f3e75a
repo git: quote urls to allow push/pull with urls that contain spaces. Fixes #703
2012-04-16 23:26:33 +02:00
Hylke Bons
37f8e050c6
config: allow to specify a custom path for each folder. Closes #680
2012-04-15 19:03:36 +02:00
Hylke Bons
192779a1b7
repo git: on conflicts, put timestamp before file extension. Fixes #699
2012-04-15 11:50:03 +02:00
Hylke Bons
9ccc9e6a08
repo git: add debug info for #677
2012-04-10 23:19:33 +02:00
Hylke Bons
8fc30c7d0f
repo: basic support for quota detection
2012-04-04 23:45:20 +01:00
Hylke Bons
993d3b1302
repo git: don't hang on large rebase outputs. Should fix #663
2012-03-28 23:11:41 +01:00
Hylke Bons
e8903492e7
Use .sparkleshare file for the repo ID, instad of the first commit hash
2012-03-26 00:41:52 +01:00
Hylke Bons
bbcb5db1db
repo git: ignore global gitconfig options when parsing the git log
2012-03-20 17:26:47 +00:00
Hylke Bons
608b4110b6
repo git: ignore global gitconfig options when parsing the git log
2012-03-20 17:20:28 +00:00
Hylke Bons
12b27f3eb2
windows setup: Reverse button order
2012-03-17 01:44:27 +00:00
Hylke Bons
301e671747
repo: Fix false 'Not everything is synced' messages after succesful conflict resolution
2012-03-16 01:53:23 +00:00
Hylke Bons
fb497c234b
repo git: add catch block to PrepareDirectories method
2012-03-12 19:56:06 +00:00
Hylke Bons
4fed581829
Remove the notes feature
2012-03-10 20:51:37 +00:00
Hylke Bons
17affe8b63
windows: some small fixes
2012-03-08 14:55:44 +00:00
Hylke Bons
98695afbf4
xplicitly hide supposed to be hidden files. Closes #605
2012-03-08 03:34:45 +00:00
Hylke Bons
1e6cba4baa
save work on windows
2012-03-06 01:18:45 +00:00
Hylke Bons
5313ffc47d
sparklelib: use a nice SparkleLib.Git namespace
2012-03-01 17:02:52 +00:00
Shish
554a6e1354
get the backend to load the shared library
2012-02-28 13:34:15 +00:00
serras
87ef4ed013
Merge branch 'master' into gettext-cs
...
Conflicts:
SparkleLib/SparkleListenerTcp.cs
2012-02-27 10:04:28 +01:00
Hylke Bons
8bed56d707
invites: upload the user's pubkey on invite accept
2012-02-17 21:26:13 +01:00
Hylke Bons
4d3f1a6e85
repo git: adjust commit message for notes
2012-02-16 22:43:41 +01:00
Hylke Bons
41ea97c927
repo: don't recurse into first .git folder
2012-02-14 20:34:03 +01:00
serras
e2e706dc6a
Merge branch 'master' into gettext-cs
...
Conflicts:
SparkleLib/Git/SparkleFetcherGit.cs
2012-02-12 16:24:12 +01:00
Hylke Bons
fc5a0427ec
event log: remove '.empty' files from rename entries of folders
2012-02-11 14:29:23 +01:00
Hylke Bons
f2b9e7bce7
More cleanup of SparkleLib API
2012-02-09 02:46:25 +01:00
Hylke Bons
3370a283ea
Clean up SparkleLib API
2012-02-08 20:42:29 +01:00
Hylke Bons
7a0527b7a7
repo: change CheckForRemoteChanges method to HasRemoteChanges property
2012-02-06 15:02:41 +01:00
Hylke Bons
121bb3e320
Clean up and remove unneeded references
2012-02-06 14:11:08 +01:00
serras
d096c39e5d
Merge branch 'master' into gettext-cs
...
Conflicts:
SparkleLib/Git/SparkleRepoGit.cs
2012-02-05 18:54:32 +01:00
Hylke Bons
8cc50596e9
controller: fix repo loading
2012-01-29 20:33:12 +00:00
Hylke Bons
716f5b1f27
event log: show repo url upon hovering of the folder name. Closes #544
2012-01-27 00:52:56 +00:00
Hylke Bons
8695c6c0b7
git: always get the url to use from the config.xml. Closes #556
2012-01-25 18:30:57 +00:00
praktikant
76360b1819
adapted coding style
2012-01-24 14:46:57 +01:00