Commit graph

1064 commits

Author SHA1 Message Date
Hylke Bons
24cc2a8b6d build: cleanup and remove translations 2012-07-26 16:49:03 +02:00
Hylke Bons
80fc1ef2c0 build: move version number definition to central place, clean up build tools 2012-07-26 15:17:35 +02:00
Hylke Bons
21b5e64552 repo git: Simplify 2012-07-26 12:43:16 +02:00
Hylke Bons
5a217fc045 lib git: simplify process starting 2012-07-26 12:30:00 +02:00
Hylke Bons
6ddff3bb33 Fix build. Closes #876 2012-07-25 13:28:50 +02:00
Hylke Bons
ee4eaa18be 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
1baf5e1953 Revert master watcher 2012-07-25 11:25:52 +02:00
Hylke Bons
8801ab4781 Code cleanup 2012-07-25 10:01:31 +02:00
Hylke Bons
17869660f5 fetcher: code cleanup 2012-07-22 22:54:59 +02:00
Hylke Bons
aad6d6e145 Disable git-bin by default 2012-07-22 20:59:51 +02:00
Hylke Bons
ce512f47f3 lib: Code cleanup 2012-07-22 11:51:56 +02:00
Hylke Bons
7bc5b1e541 repo git: code cleanup 2012-07-22 11:40:49 +02:00
Hylke Bons
cc36f40868 repo: move changeset list creation logic to base class 2012-07-19 22:21:38 +02:00
Hylke Bons
89c94fba7d repo: simplify remote timer check 2012-07-19 22:05:29 +02:00
Hylke Bons
a385b92c62 eventlog: Fix some occasions where the spinner doesn't appear. 2012-07-18 23:31:50 +02:00
Matthias Dittrich
f42bd0e064 fixes windows build 2012-07-18 15:40:29 +02:00
Hylke Bons
13469121e7 lib: code cleanup 2012-07-18 14:51:09 +02:00
Hylke Bons
239499ffd0 Remove event handling boilerplate everywhere 2012-07-18 13:09:37 +02:00
Hylke Bons
590dacc151 windows: Remove SparkleShare folder migration code 2012-07-17 22:45:33 +02:00
Hylke Bons
1dcf21e235 controller: Code cleanups 2012-07-17 22:14:58 +02:00
Hylke Bons
95bc3e9a20 git: Use the same Unicode form on all filesystems. Closes #478 2012-07-15 21:01:06 +02:00
Hylke Bons
7527d78d29 mac invites: don't check certificate 2012-07-15 15:59:04 +02:00
Hylke Bons
5950e8fbca watcher: Fix disposing, style fixes 2012-07-15 12:05:58 +02:00
Hylke Bons
ca3384c7e2 repo: don't dispose common listeners/watchers 2012-07-14 17:54:34 +02:00
Hylke Bons
e6c095d038 repo: remove unneeded try/catch block and fix up some logic 2012-07-14 17:18:29 +02:00
Hylke Bons
e677117073 repo: avoid race condition causing multiple syncups at the same time 2012-07-14 14:35:55 +02:00
Hylke Bons
037606c857 windows: add missing file reference. Fixes #852 2012-07-14 13:29:07 +02:00
Hylke Bons
8135cda1e6 config: Remove the folders_path option 2012-07-14 13:18:13 +02:00
Hylke Bons
5e0f9f89c0 Some rearrangements 2012-07-14 12:45:54 +02:00
Hylke Bons
84e536fb59 Merge branch 'master' into about 2012-07-13 14:20:10 +02:00
Hylke Bons
7c285c6978 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
34cb19d0d8 config: Don't accept null values as identifiers 2012-07-11 22:31:45 +02:00
Hylke Bons
7b78db23f5 config: Adjust coding style of last commit 2012-07-10 22:13:18 +02:00
Matthias Dittrich
599eb3cd96 Fixed a NullreferenceException on startup #844 2012-07-10 16:25:20 +02:00
Hylke Bons
762b52e06b Use only a single watcher to monitor the SparkleShare folder 2012-07-08 23:53:44 +02:00
Hylke Bons
15bf7624bc Disable git-bin 2012-07-08 12:49:17 +02:00
Hylke Bons
7b753bfbda fetcher git: show error messages when host key has changed 2012-07-08 12:30:37 +02:00
Hylke Bons
76abd48147 fetcher: simplfy ID generation 2012-07-08 11:29:00 +02:00
Hylke Bons
577210ee9a Allow renaming of folders. Closes #466 2012-07-06 11:26:02 +02:00
Hylke Bons
0d1906355b Calculate IDs in the fetcher and add the to the config 2012-07-05 13:38:55 +02:00
Hylke Bons
6b6c38bcb3 listener tcp: Remove lock 2012-07-05 13:37:18 +02:00
Matthias Dittrich
2cb49ab2c9 Sparkle can now handle files with special characters 2012-07-05 13:37:18 +02:00
Hylke Bons
7066f3a4a8 lib: style cleanups 2012-07-03 09:59:19 +02:00
Hylke Bons
a498f1ec3f repo git: Use a more descriptive flag when calling git-log 2012-07-03 09:59:18 +02:00
Hylke Bons
23511bba70 repo git: rewrite HasLocalChanges 2012-07-03 09:59:18 +02:00
Hylke Bons
a4f11d4cd9 repo git: catch IOException in ResolveConflict method 2012-07-03 09:59:18 +02:00
Hylke Bons
fa9642bdd1 repo git: Fix conflict resolution 2012-07-03 09:59:18 +02:00
Hylke Bons
28ce0e8901 repo git: refactor andf fix Rebase and FormatCommitMessage methods 2012-07-03 09:59:18 +02:00
Hylke Bons
93794b581e repo git: Remove some redundant lines 2012-07-03 09:59:18 +02:00
Matthias Dittrich
cb6b2cd980 Now filesnames with special chars will be written properly in the comments 2012-07-03 09:59:18 +02:00