Commit graph

3266 commits

Author SHA1 Message Date
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
Hylke Bons 1ca4c9eecd windows: some more Dispatcher.Invoke replacments 2012-07-05 13:37:18 +02:00
Matthias Dittrich f6acb16cd3 Replaced all Invoke calls (recognised another deadlock)
Conflicts:

	SparkleShare/Windows/SparkleEventLog.cs
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 ffaa23a733 listener tcp: Remove lock 2012-07-03 20:27:42 +02:00
Hylke Bons ea1e0ce4e7 windows: some more Dispatcher.Invoke replacments 2012-07-03 10:13:40 +02:00
Matthias Dittrich bf5ae0f689 Replaced all Invoke calls (recognised another deadlock)
Conflicts:

	SparkleShare/Windows/SparkleEventLog.cs
2012-07-03 10:09:29 +02:00
Hylke Bons 22fcca2fac lib: style cleanups 2012-07-03 09:59:19 +02:00
Hylke Bons e1b1075f2d Revert previous commit 2012-07-03 09:59:19 +02:00
Hylke Bons a10851339d Fix README table 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
Matthias Dittrich 4f5267b6fb Changed build order to prevent using old version when pressing F5 2012-07-03 09:59:18 +02:00
Matthias Dittrich b5f9378a65 Fix for really annoying debugger exception + fixed whitespace 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
Arnold Bechtoldt ad765949de fixing some tiny typos within NEWS file
Signed-off-by: Arnold Bechtoldt <mail@arnoldbechtoldt.com>
2012-07-03 09:59:17 +02:00
Hylke Bons 9cf2c67b2c lib: style cleanups 2012-07-03 09:58:35 +02:00
Hylke Bons ccd967775d Revert previous commit 2012-07-03 00:37:15 +02:00
Hylke Bons c5503a52ae Fix README table 2012-07-03 00:15:55 +02:00
Hylke Bons b85ef3fed7 repo git: Use a more descriptive flag when calling git-log 2012-07-03 00:08:34 +02:00
Hylke Bons 4acb33ae0d repo git: rewrite HasLocalChanges 2012-07-02 23:58:37 +02:00
Hylke Bons 90ce809d6f repo git: catch IOException in ResolveConflict method 2012-07-02 23:42:49 +02:00
Hylke Bons 6d6b2c240c repo git: Fix conflict resolution 2012-07-02 23:23:28 +02:00
Hylke Bons 2a58657d6e Merge pull request #829 from matthid/pullVisualStudioDebuggerProblem
Fix for really annoying debugger exception + fixed whitespace
2012-07-02 13:31:31 -07:00
Hylke Bons 9f3dff6270 Merge pull request #831 from matthid/pullProjectSettings
Improved Project settings
2012-07-02 13:01:36 -07:00
Hylke Bons 11e15daf67 repo git: refactor andf fix Rebase and FormatCommitMessage methods 2012-07-02 21:54:29 +02:00
Hylke Bons 96254f01e2 repo git: Remove some redundant lines 2012-07-02 18:37:35 +02:00
Hylke Bons 103fa78d8a Merge pull request #830 from matthid/pullSpecialCharsInCommentsFix
Now filesnames with special chars will be written properly in the comments
2012-07-02 04:36:59 -07:00
Matthias Dittrich f89403046a Now filesnames with special chars will be written properly in the comments 2012-07-02 12:44:19 +02:00
Matthias Dittrich 0b01a84796 Tried to set stylecop to match the project code style 2012-07-02 12:42:41 +02:00
Matthias Dittrich 719d3d2d96 Changed build order to prevent using old version when pressing F5 2012-07-02 12:42:10 +02:00
Matthias Dittrich f945cf85cb Fix for really annoying debugger exception + fixed whitespace 2012-07-02 12:15:53 +02:00
Hylke Bons 32d149dad1 lib git: Run commit with --all and deduplicate code somewhat 2012-07-01 13:30:33 +02:00
Hylke Bons eebb412914 repo git: Fix coding style for #823 2012-07-01 10:46:42 +02:00
Matthias Dittrich bacd781d94 Found another place where the Utf8-fix is required 2012-07-01 01:38:48 +02:00
Matthias Dittrich 01071047ea Sparkle can now handle files with special characters 2012-06-30 23:36:19 +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