Hylke Bons
|
91b846343b
|
Rename README again...
|
2012-07-09 17:14:06 +02:00 |
|
|
Hylke Bons
|
ff6b97bd02
|
Rename README
|
2012-07-09 17:09:16 +02:00 |
|
|
Hylke Bons
|
6bd596e846
|
mac about: Add various links to about dialog
|
2012-07-09 17:07:32 +02:00 |
|
|
Hylke Bons
|
8184ad244c
|
Add .txt extensions to info files ofr easy opening
|
2012-07-09 17:07:05 +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
|
e20dcd55ea
|
Merge branch 'git-bin'
Conflicts:
SparkleLib/Git/SparkleRepoGit.cs
|
2012-07-08 12:51:28 +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
|
015ad00a25
|
controller: Fix repo loading
|
2012-07-08 10:38:14 +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 |
|
|
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 |
|