Hylke Bons
eaead8c87d
Some rearrangements
2012-07-14 12:45:54 +02:00
Hylke Bons
64bb74f06e
Merge branch 'master' into about
2012-07-13 14:20:10 +02:00
Hylke Bons
ed190db27b
repo: send Idle event when there are no changes after activities have settled. Fixes #850
2012-07-13 14:19:46 +02:00
Hylke Bons
29eaffc6d4
config: Don't accept null values as identifiers
2012-07-11 22:31:45 +02:00
Hylke Bons
165181c009
config: Adjust coding style of last commit
2012-07-10 22:13:18 +02:00
Matthias Dittrich
63eb793abc
Fixed a NullreferenceException on startup #844
2012-07-10 16:25:20 +02:00
Hylke Bons
ca22672842
Use only a single watcher to monitor the SparkleShare folder
2012-07-08 23:53:44 +02:00
Hylke Bons
f209602f3a
Disable git-bin
2012-07-08 12:49:17 +02:00
Hylke Bons
a7d926b6fa
fetcher git: show error messages when host key has changed
2012-07-08 12:30:37 +02:00
Hylke Bons
afe0a0c5fd
fetcher: simplfy ID generation
2012-07-08 11:29:00 +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
Hylke Bons
b87b642742
listener tcp: Remove lock
2012-07-05 13:37:18 +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
Matthias Dittrich
0b7fa8a193
Tried to set stylecop to match the project code style
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
efccc2c1c3
fetcher git: Refactor
2012-06-29 14:00:25 +01:00
Hylke Bons
8470b06a01
fetcher git: Simplify attributes file creation
2012-06-29 13:17:59 +01:00
Hylke Bons
a4718cf100
fetcher git: Simplify install of config after clone
2012-06-29 12:53:13 +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
a0b3c101d9
repo: Fix some cases where the remote timer isn't resumed
2012-06-29 00:11:25 +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
1b04fda8f7
fetcher git: don't read output on checkout and add --quiet option
2012-06-28 12:18:00 +01:00
Hylke Bons
5ee72e37f5
fetcher: Always delete the tmp host key file after getting its fingerprint
2012-06-28 12:03:04 +01:00
Hylke Bons
744d4f2ffa
fetcher: put quotes around host key file path. Fixes #815
2012-06-28 11:57:10 +01:00
Hylke Bons
22698aa00b
config: change debug log file name
2012-06-27 13:12:04 +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
2f847093c4
windows: bump version number
2012-06-25 22:55:43 +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
e72b3828d1
linux: fix build
2012-06-19 15:59:54 +01:00
Hylke Bons
090a34a3c7
lib git: treat merge commits like any other commit
2012-06-19 10:54:46 +01:00
Hylke Bons
142e0b46a1
Remove some unused code
2012-06-19 10:43:30 +01:00
Hylke Bons
ace1fb2c40
setup: show raw (git) error message on failed add
2012-06-17 22:57:15 +01:00
Hylke Bons
6d796f35bf
make
2012-06-17 21:56:27 +01:00
Hylke Bons
37b94b23bf
mac eventlog: make window resizable
2012-06-17 00:24:30 +01:00
Hylke Bons
7ceb17907d
Simplify command line argument parsing
2012-06-15 13:08:13 +01:00
Hylke Bons
07c4d271e3
Allow apostrophes and single quotes in folder names, but don't allow double quotes. Fixes #787
2012-06-14 13:54:59 +01:00
Hylke Bons
febd993f29
Refactor adding of (empty) repos. Fixes #773
2012-06-10 23:56:39 +01:00
Hylke Bons
19b7250b61
repo: more cleanup
2012-06-10 11:57:31 +01:00
Hylke Bons
fccb790a2d
repo: Simplify watch toggling mechanism
2012-06-10 11:03:03 +01:00
Hylke Bons
c99e57ea74
repo: Simplify local change detection code using a single thread
2012-06-10 01:16:28 +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
be1fbdc928
listener: set port 80 as the default
2012-05-28 00:51:37 +01:00
Hylke Bons
52e3e78d2f
Only fetch gravatars once, fix some UI blocking
2012-05-28 00:14:45 +01:00
Hylke Bons
43703b94f8
repo git: only squash commits by the same person
2012-05-28 00:14:00 +01:00
Hylke Bons
32735aa730
Remove unneeded reference
2012-05-27 19:25:14 +01:00
Hylke Bons
e1c16f0f5f
eventlog: sort changes by timestamp, not type
2012-05-27 19:24:12 +01:00
Hylke Bons
9a7e1eaee1
setup: Fix page logic
2012-05-20 17:16:14 +01:00
Hylke Bons
6a0ee9ed63
listener tcp: Catch more exceptions and increase poll/ping interval. Fixes #734
2012-05-20 14:28:14 +01:00
Hylke Bons
ea432c32e8
repo git: catch exceptions creating .empty files. Fixes #733
2012-05-20 12:51:09 +01:00
Hylke Bons
23a31230a4
repo: fix whitespace
2012-05-19 16:17: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
d149d9dce8
Fix crashes with unavailable notification service
2012-05-14 23:35:59 +01:00
Hylke Bons
07eda17fa6
fetcher base: be more specific about ignoring OS X's Icon files
2012-05-14 21:34:16 +01:00
Hylke Bons
9800bcf421
Cache changesets in the backend
2012-04-29 15:19:36 +01:00
Hylke Bons
06246c0ebf
mac: Remove unused graphic from project
2012-04-28 17:19:21 +01:00
Hylke Bons
921d66baa6
Merge branch 'http'
2012-04-28 09:51:41 +01:00
Hylke Bons
b2ce29f5f2
Remove some debug rules used for crypto feature
2012-04-26 18:48:18 +01:00
Hylke Bons
8ee99fa5a0
fetcher git: override global git crlf settings. prevents some sync loops
2012-04-26 18:32:57 +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
7c502e9b20
fetcher git: accept HTTP(S) addresses
2012-04-26 14:58:05 +02:00
Luke Fitzgerald
da0c7f572e
Allow paths containing spaces
2012-04-26 01:34:28 +01:00
Hylke Bons
d2616beba3
windows lib: Put back reference for #705
2012-04-19 14:59:04 +02:00
Hylke Bons
4089059f6d
windows lib: always use latest .NET version. Fixes #705
2012-04-19 14:20:01 +02:00
Hylke Bons
a7884fc1f1
config: return HomePath enum directly. #705
2012-04-18 16:33:48 +02:00
Hylke Bons
1dd617648a
fetcher git: also dispose git process on dispose
2012-04-18 11:52:45 +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
f67b0c8141
fetcher: Add exclude rule for *.autosave files
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
508092e0f1
config: remove old and unused methods
2012-04-15 16:58:39 +02:00
Hylke Bons
5f137ff0e3
fetcher: more friendly message about the accepted host key
2012-04-15 12:35:17 +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
06b821a3a3
Verify known host fingerprints and warn about new ones
2012-04-13 00:44:31 +02:00
Hylke Bons
28734203c6
fetcher: Fix some url creations errors
2012-04-11 23:10:02 +02:00
Hylke Bons
7a6d80b9dc
fetcher: don't add duplicates to known_hosts
2012-04-11 21:31:18 +02:00
Hylke Bons
d79408dc79
Manually add host key to know_hosts, don't mess with the user's SSH config. Closes #497
2012-04-11 20:07:34 +02:00
Hylke Bons
bf45b91ddc
fetcher: Close on cancel too
2012-04-11 13:04:42 +02:00
Hylke Bons
6ae0ca58b2
fetcher: Add debug info for #692
2012-04-11 12:51:53 +02:00
Hylke Bons
19aed69038
config: Remove commented out code
2012-04-11 12:03:34 +02:00
Hylke Bons
9ccc9e6a08
repo git: add debug info for #677
2012-04-10 23:19:33 +02:00
Hylke Bons
12a4aa5e1b
windows: add missing source file to fix build
2012-04-05 13:57:50 +01:00
Hylke Bons
8fc30c7d0f
repo: basic support for quota detection
2012-04-04 23:45:20 +01:00
Hylke Bons
e1a1ab7396
Add option to add projects without full history (git: --depth=1)
2012-03-29 01:44:26 +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
2227d82c33
fetcher: add exclude rule for LibreOffice lock files
2012-03-22 21:10:43 +00:00
Tijl Vercaemer
fd8fd378b9
Added System.Xml reference to SparkleLib
2012-03-21 12:34:48 +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
1ea243c76f
windows: set version manually
2012-03-18 20:16:52 +00:00
Travis Glenn Hansen
582a6b5c1f
fixing HomePath on linux
2012-03-17 17:15:35 -06:00
Hylke Bons
e91de7f442
listener tcp: catch some potential exceptions
2012-03-17 19:16:53 +00:00
Hylke Bons
12b27f3eb2
windows setup: Reverse button order
2012-03-17 01:44:27 +00:00
Hylke Bons
5ca7cc147a
mac: Fix build
2012-03-16 18:42:13 +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
daf4818cc2
remove some TODOs
2012-03-15 23:54:18 +00:00
Hylke Bons
85bec2210a
windows: Add migration code to use ~/SparkleShare instead of ~/My Documents/SparkleShare
2012-03-15 03:56:10 +00:00
Hylke Bons
a1d5054af4
setup controller: refactor some order logic. Fixes #627 #630
2012-03-14 03:26:42 +00:00
Hylke Bons
82a88cb504
listener tcp: don't ping anymore when we've disconnected but haven't noticed. Fixes #629
2012-03-13 18:07:03 +00:00
Hylke Bons
fb497c234b
repo git: add catch block to PrepareDirectories method
2012-03-12 19:56:06 +00:00
Hylke Bons
065ad4074d
windows: don't care about the commit hash in the version number
2012-03-11 23:44:40 +00:00
Hylke Bons
95a1b3ec59
window: Move to .NET 4.0
2012-03-11 13:17:53 +00:00
Hylke Bons
f12118f51b
remove SparkleNote class
2012-03-11 02:54:52 +00:00
Hylke Bons
4fed581829
Remove the notes feature
2012-03-10 20:51:37 +00:00
Hylke Bons
5b0ccc607c
window setup: implement warning about global gitignore
2012-03-09 04:04:16 +00:00
Hylke Bons
e6edff1d21
Fix some instances of 'could not load backend'
2012-03-08 23:27:49 +00:00
Hylke Bons
17affe8b63
windows: some small fixes
2012-03-08 14:55:44 +00:00
Hylke Bons
b11f6af166
Replace tabs with spaces in project
2012-03-08 03:35:24 +00:00
Hylke Bons
98695afbf4
xplicitly hide supposed to be hidden files. Closes #605
2012-03-08 03:34:45 +00:00
Hylke Bons
0a19ab2da7
windows: fix some status icon issue
2012-03-08 02:55:30 +00:00
Hylke Bons
1e6cba4baa
save work on windows
2012-03-06 01:18:45 +00:00
Hylke Bons
5393a5ac93
windows: remove sparkleabout resource files
2012-03-03 16:53:44 +00:00
Hylke Bons
4f48167d73
windows: clean up statusicon somewhat
2012-03-03 00:43:29 +00:00
serras
ac66fa5693
Adapt Windows build to a separate Git DLL.
2012-03-02 22:05:05 +01:00
Hylke Bons
ab9358fcdf
setup: Create a reusable plugin for each succesfully used host. Closes #547
2012-03-01 23:57:12 +00:00
Hylke Bons
977c225e9f
Fix progress delay when there was an error
2012-03-01 17:48:05 +00:00
Hylke Bons
5313ffc47d
sparklelib: use a nice SparkleLib.Git namespace
2012-03-01 17:02:52 +00:00
Hylke Bons
fda4cc3f26
Merge branch 'backend-dlls' of https://github.com/shish/SparkleShare into shish
2012-03-01 16:34:45 +00:00
serras
92cdec0552
Add default version when compiling without Git installed
2012-03-01 14:55:17 +00:00
Shish
6835489eff
wibble automake to build the extra backend
2012-02-28 14:34:23 +00:00
Shish
554a6e1354
get the backend to load the shared library
2012-02-28 13:34:15 +00:00
Shish
75a3650bc8
don't compile backend into sparklelib
2012-02-28 13:30:09 +00:00
Hylke Bons
e118dc349a
Merge branch 'gettext-cs' of https://github.com/serras/SparkleShare into windows
2012-02-27 16:34:58 +00:00
serras
9cb6216109
- Move Windows libraries to special lib folder
...
- Change references to new positions
2012-02-27 13:21:13 +01:00
serras
a1c05e9ec5
- Add new project files
...
- Chnage Windows views to keep them in sync with controllers
2012-02-27 12:55:16 +01:00
serras
87ef4ed013
Merge branch 'master' into gettext-cs
...
Conflicts:
SparkleLib/SparkleListenerTcp.cs
2012-02-27 10:04:28 +01:00
Hylke Bons
23fc46bc09
fetcher git: don't simulate progress when clone command failed
2012-02-26 15:58:09 +00:00
Hylke Bons
5d7c9a79ac
Allow invites and plugins to set a custom <announcements_url>. Closes #562
2012-02-24 18:50:05 +01:00
Hylke Bons
758bfe62a9
Point to the right location for the avatars on Linux
2012-02-23 01:30:28 +01:00
Hylke Bons
135e2fe73f
Fix Linux build
2012-02-19 21:33:25 +01:00