Hylke
|
7b87b1f6b9
|
avatars: save to buffer instead of file: less blinking of event log, simpler, so fewer bugs
|
2011-08-25 15:36:26 +01:00 |
|
Hylke
|
b9eab774dc
|
git fetch all branches
|
2011-06-24 23:43:11 +01:00 |
|
Hylke
|
52e44b2053
|
add note fetching line to config
|
2011-06-24 23:23:41 +01:00 |
|
Hylke
|
ef292b34cc
|
Merge branch 'master' into notes
Conflicts:
SparkleLib/Git/SparkleRepoGit.cs
|
2011-06-24 19:13:02 +01:00 |
|
wimh
|
0fb2bc840e
|
Merge remote branch 'upstream/master' into merge
|
2011-06-23 20:39:41 +02:00 |
|
wimh
|
a97b7d9647
|
Merge commit '4f59a03a6f395b1db7d6' into merge
|
2011-06-23 20:38:21 +02:00 |
|
Hylke
|
c5a092c8a4
|
repo: don't show warning statusicon upon initial commit
|
2011-06-23 13:56:25 +01:00 |
|
Hylke Bons
|
25e08545d2
|
continue implementing notes
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
b7c9fe4431
|
save progress on notes
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
de98e29f70
|
Add each note to its own namespace to avoid conflicts
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
a801f68340
|
fix AddNote, add Note object
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
1d5dd2a8b0
|
make adding a note work
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
f1ff61950c
|
add AddNote method
|
2011-06-23 01:44:43 +01:00 |
|
Hylke Bons
|
06683678b2
|
Fix timzones in timestamps, again...
|
2011-06-15 00:34:29 +01:00 |
|
wimh
|
5501a448b5
|
reset to upstream/master, add windows files and fixes
|
2011-06-11 21:52:41 +02:00 |
|
Hylke Bons
|
72f4052526
|
repo git: strip quotes from git commit message
|
2011-06-11 18:51:39 +01:00 |
|
Hylke Bons
|
f3aca9da0a
|
repo git: strip quotes from git commit message
|
2011-06-10 21:40:13 +01:00 |
|
Hylke Bons
|
c16b2cb420
|
Save work
|
2011-06-10 00:01:45 +01:00 |
|
Hylke Bons
|
911a1f941a
|
changeset: Add a Folder property
|
2011-06-09 21:25:36 +01:00 |
|
Hylke Bons
|
04d63c0a27
|
Update out of date SparkleShare tagline
|
2011-06-02 00:08:05 +01:00 |
|
Hylke Bons
|
6dfab204e7
|
fetcher git: fix url construction
|
2011-05-31 18:30:28 +01:00 |
|
Hylke Bons
|
71b43d530a
|
Move url forming logic to the fetcher
|
2011-05-31 02:28:23 +01:00 |
|
Hylke Bons
|
a941bd3b80
|
repo git: only disable emable watching once
|
2011-05-30 16:20:25 +01:00 |
|
Hylke Bons
|
6298c86a36
|
repo git: convert commit timestamps by converting them to utc, then converting them to our timezone
|
2011-05-29 17:47:40 +01:00 |
|
Hylke Bons
|
6926638822
|
repo: normalise timezones for the log
|
2011-05-29 16:48:47 +01:00 |
|
Hylke Bons
|
9549ae3816
|
repo: remove obsolete static IsRepo method
|
2011-05-28 20:23:33 +01:00 |
|
Hylke Bons
|
10ac5cbe5c
|
config: add url as part of the folder config xml
|
2011-05-26 23:41:55 +01:00 |
|
Hylke Bons
|
109f75aee9
|
Fix configuration issues
|
2011-05-26 20:46:49 +01:00 |
|
Hylke Bons
|
0167aef16a
|
repo git: turn off garbage collection by default
|
2011-05-22 18:54:47 +01:00 |
|
Hylke Bons
|
00327a1eb0
|
repo: set HasUnsyncedChanges to true after a resolved conflict, so we'll push them later
|
2011-05-22 18:49:04 +01:00 |
|
Hylke Bons
|
b18db88b61
|
repo: do a full SyncUpBase after a git rebase
|
2011-05-22 17:51:58 +01:00 |
|
Hylke Bons
|
442dc62980
|
repo git: fix compile error
|
2011-05-22 16:29:23 +01:00 |
|
Hylke Bons
|
0a91597291
|
repo git: push changes after conflict resolution
|
2011-05-22 16:27:06 +01:00 |
|
Hylke Bons
|
7be63b07c9
|
repo: tweak algorithm
|
2011-05-22 15:46:24 +01:00 |
|
Hylke Bons
|
16bfce692a
|
build: fix build system
|
2011-05-22 12:42:22 +01:00 |
|
Hylke Bons
|
3e65a4fc94
|
build: move backend classes into subfolders
|
2011-05-22 12:28:14 +01:00 |
|