Commit graph

3215 commits

Author SHA1 Message Date
Hylke Bons d244f12459 Calculate IDs in the fetcher and add the to the config 2012-07-05 13:38:55 +02:00
Hylke Bons 201a753c41 listener tcp: Remove lock 2012-07-05 13:37:18 +02:00
Hylke Bons c796652813 windows: some more Dispatcher.Invoke replacments 2012-07-05 13:37:18 +02:00
Matthias Dittrich b8680aa070 Replaced all Invoke calls (recognised another deadlock)
Conflicts:

	SparkleShare/Windows/SparkleEventLog.cs
2012-07-05 13:37:18 +02:00
Matthias Dittrich 49fd14ebdb Sparkle can now handle files with special characters 2012-07-05 13:37:18 +02:00
Hylke Bons 78b0069a99 listener tcp: Remove lock 2012-07-03 20:27:42 +02:00
Hylke Bons 119df4f0eb windows: some more Dispatcher.Invoke replacments 2012-07-03 10:13:40 +02:00
Matthias Dittrich 92cd4171e7 Replaced all Invoke calls (recognised another deadlock)
Conflicts:

	SparkleShare/Windows/SparkleEventLog.cs
2012-07-03 10:09:29 +02:00
Hylke Bons aa87519cc6 lib: style cleanups 2012-07-03 09:59:19 +02:00
Hylke Bons 99f0889d18 Revert previous commit 2012-07-03 09:59:19 +02:00
Hylke Bons 68d70ba080 Fix README table 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
Matthias Dittrich 583f13c8ff Tried to set stylecop to match the project code style 2012-07-03 09:59:18 +02:00
Matthias Dittrich ab5426d0e2 Changed build order to prevent using old version when pressing F5 2012-07-03 09:59:18 +02:00
Matthias Dittrich 6f20f88c15 Fix for really annoying debugger exception + fixed whitespace 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
Arnold Bechtoldt aff1cc5133 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 a2306d3fa3 lib: style cleanups 2012-07-03 09:58:35 +02:00
Hylke Bons 0efac5cd70 Revert previous commit 2012-07-03 00:37:15 +02:00
Hylke Bons 0079a62696 Fix README table 2012-07-03 00:15:55 +02:00
Hylke Bons e884defeee repo git: Use a more descriptive flag when calling git-log 2012-07-03 00:08:34 +02:00
Hylke Bons f7b5064484 repo git: rewrite HasLocalChanges 2012-07-02 23:58:37 +02:00
Hylke Bons dbf458b931 repo git: catch IOException in ResolveConflict method 2012-07-02 23:42:49 +02:00
Hylke Bons 154c3a3984 repo git: Fix conflict resolution 2012-07-02 23:23:28 +02:00
Hylke Bons 11dd60ca89 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 1e0a6b2f3c Merge pull request #831 from matthid/pullProjectSettings
Improved Project settings
2012-07-02 13:01:36 -07:00
Hylke Bons e02fbdbc2c repo git: refactor andf fix Rebase and FormatCommitMessage methods 2012-07-02 21:54:29 +02:00
Hylke Bons f75bdb5859 repo git: Remove some redundant lines 2012-07-02 18:37:35 +02:00
Hylke Bons 444b2ddecb 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 8aea2818b5 Now filesnames with special chars will be written properly in the comments 2012-07-02 12:44:19 +02:00
Matthias Dittrich 779881aa43 Tried to set stylecop to match the project code style 2012-07-02 12:42:41 +02:00
Matthias Dittrich 480861585d Changed build order to prevent using old version when pressing F5 2012-07-02 12:42:10 +02:00
Matthias Dittrich 0f970278d8 Fix for really annoying debugger exception + fixed whitespace 2012-07-02 12:15:53 +02:00
Hylke Bons 1c4467e5b5 lib git: Run commit with --all and deduplicate code somewhat 2012-07-01 13:30:33 +02:00
Hylke Bons be9f7de13f repo git: Fix coding style for #823 2012-07-01 10:46:42 +02:00
Matthias Dittrich 9ddb9cbb7e Found another place where the Utf8-fix is required 2012-07-01 01:38:48 +02:00
Matthias Dittrich b2769b7faf Sparkle can now handle files with special characters 2012-06-30 23:36:19 +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