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

Conflicts:
	trunk/Pithos.Interfaces/ObjectInfo.cs

diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index 2463361..e267713 100644 (file)
--- a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
+++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
@@ -93,5 +93,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.20507.0")]
-[assembly: AssemblyFileVersionAttribute("0.7.20507.0")]
+[assembly: AssemblyVersion("0.7.20508.0")]
+[assembly: AssemblyFileVersionAttribute("0.7.20508.0")]

diff --git a/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs b/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
index 1718b04..4ac840d 100644 (file)
--- a/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
+++ b/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.530
+//     Runtime Version:4.0.30319.431
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -121,7 +121,7 @@ namespace Pithos.Client.WPF.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("pkanavos")]
+        [global::System.Configuration.DefaultSettingValueAttribute("grnet")]
         public string UserName {
             get {
                 return ((string)(this["UserName"]));
@@ -133,7 +133,7 @@ namespace Pithos.Client.WPF.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("9d3cb7b231e96f72ebe96af1c6cd5112")]
+        [global::System.Configuration.DefaultSettingValueAttribute("-")]
         public string ApiKey {
             get {
                 return ((string)(this["ApiKey"]));

diff --git a/trunk/Pithos.Client.WPF/Properties/Settings.settings b/trunk/Pithos.Client.WPF/Properties/Settings.settings
index dca5124..174ad20 100644 (file)
--- a/trunk/Pithos.Client.WPF/Properties/Settings.settings
+++ b/trunk/Pithos.Client.WPF/Properties/Settings.settings
@@ -27,10 +27,10 @@
       <Value Profile="(Default)">True</Value>
     </Setting>
     <Setting Name="UserName" Type="System.String" Scope="User">
-      <Value Profile="(Default)">pkanavos</Value>
+      <Value Profile="(Default)">grnet</Value>
     </Setting>
     <Setting Name="ApiKey" Type="System.String" Scope="User">
-      <Value Profile="(Default)">9d3cb7b231e96f72ebe96af1c6cd5112</Value>
+      <Value Profile="(Default)">-</Value>
     </Setting>
     <Setting Name="ShowDesktopNotifications" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>

diff --git a/trunk/Pithos.Client.WPF/app.config b/trunk/Pithos.Client.WPF/app.config
index 6cf45a1..c356a01 100644 (file)
--- a/trunk/Pithos.Client.WPF/app.config
+++ b/trunk/Pithos.Client.WPF/app.config
@@ -63,10 +63,10 @@
     <value>True</value>
    </setting>
    <setting name="UserName" serializeAs="String">
-    <value>pkanavos</value>
+    <value>grnet</value>
    </setting>
    <setting name="ApiKey" serializeAs="String">
-    <value>9d3cb7b231e96f72ebe96af1c6cd5112</value>
+    <value>-</value>
    </setting>
    <setting name="ShowDesktopNotifications" serializeAs="String">
     <value>True</value>