Statistics
| Branch: | Revision:

root / trunk / Pithos.Client.WPF / FileProperties / ConflictsViewModel.cs @ 21141c06

History | View | Annotate | Download (5.4 kB)

# Date Author Comment
96e5791c 10/04/2012 04:07 pm Panagiotis Kanavos

Various
7e39367d 09/20/2012 05:14 pm Panagiotis Kanavos

Merge branch 'Polling' of https://code.grnet.gr/git/pithos-ms-client into Polling

Conflicts:
trunk/Pithos.Core/Agents/StatusAgent.cs
Also switched from SQLite, ActiveRecord to pure NHibernate and SQL Server Compact
a60e5887 06/23/2012 05:43 pm Panagiotis Kanavos

Added check for last MD5 modification, to avoid redundant recalculation of MD5
368e06fd 05/12/2012 09:50 pm Panagiotis Kanavos

Added Keep Local, Keep Server conflict resolution actions
Modified ConflictsView.xaml to always display a combobox with the actions
Fixed PollAgent bug that caused false conflict reports
Modification of settings now causes a sync operation to force PollAgent to use modified poll settings
a308d291 05/11/2012 11:26 pm Panagiotis Kanavos

Added Clear Conflict action to resolver
dd19241a 05/01/2012 07:18 pm Panagiotis Kanavos

Adding a new account now forces a logout to clear any stale Pithos cookies
69588a95 04/27/2012 12:00 am Panagiotis Kanavos

Fix for missing directories
0a9d4d18 04/24/2012 09:37 pm Panagiotis Kanavos

New SQLite version
5c46341d 04/23/2012 09:26 pm Panagiotis Kanavos

Fixed Check initialization bug in Selective Synch
bc27bb7e 04/23/2012 08:41 pm Panagiotis Kanavos

Added orphan state removal
4ff68c10 04/06/2012 11:33 pm Panagiotis Kanavos

Added Reason column
Added Conflict filter
e3bc51ba 04/06/2012 11:27 pm Panagiotis Kanavos

Changed listbox in ConflictsView.xaml to datagrid
Fixed context menu
f4a72cb8 04/06/2012 10:48 pm Panagiotis Kanavos

Notification changes
Fixed the way folders appear in Selective Synch
Added form with conflicts