Commit graph

813 commits

Author SHA1 Message Date
Hylke Bons 2b4843ad24 build: move version number definition to central place, clean up build tools 2012-07-26 15:17:35 +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 afd894ac50 Revert master watcher 2012-07-25 11:25:52 +02:00
Hylke Bons 63eaf5daa5 Code cleanup 2012-07-25 10:01:31 +02:00
Hylke Bons 0b500c3ef4 fetcher: code cleanup 2012-07-22 22:54:59 +02:00
Hylke Bons ce844af1ee Disable git-bin by default 2012-07-22 20:59:51 +02:00
Hylke Bons 7d9e963c73 lib: Code cleanup 2012-07-22 11:51:56 +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 32848f8772 repo: simplify remote timer check 2012-07-19 22:05:29 +02:00
Hylke Bons 437cfbe1e1 eventlog: Fix some occasions where the spinner doesn't appear. 2012-07-18 23:31:50 +02:00
Matthias Dittrich 0887aff38d fixes windows build 2012-07-18 15:40:29 +02:00
Hylke Bons f3784ddc98 lib: code cleanup 2012-07-18 14:51:09 +02:00
Hylke Bons 78e96474b2 Remove event handling boilerplate everywhere 2012-07-18 13:09:37 +02:00
Hylke Bons e0949ae082 windows: Remove SparkleShare folder migration code 2012-07-17 22:45:33 +02:00
Hylke Bons 2ca2c12475 controller: Code cleanups 2012-07-17 22:14:58 +02:00
Hylke Bons accf447456 git: Use the same Unicode form on all filesystems. Closes #478 2012-07-15 21:01:06 +02:00
Hylke Bons 7fb8cc587f mac invites: don't check certificate 2012-07-15 15:59:04 +02:00
Hylke Bons dde10d33da watcher: Fix disposing, style fixes 2012-07-15 12:05:58 +02:00
Hylke Bons da15d03621 repo: don't dispose common listeners/watchers 2012-07-14 17:54:34 +02:00
Hylke Bons e61e33b47f repo: remove unneeded try/catch block and fix up some logic 2012-07-14 17:18:29 +02:00
Hylke Bons f67df255d4 repo: avoid race condition causing multiple syncups at the same time 2012-07-14 14:35:55 +02:00
Hylke Bons f5b0af6e54 windows: add missing file reference. Fixes #852 2012-07-14 13:29:07 +02:00
Hylke Bons 0514d3963f config: Remove the folders_path option 2012-07-14 13:18:13 +02:00
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