Merge branch 'develop'

This commit is contained in:
Samuele Locatelli
2013-03-28 10:01:57 +01:00
16 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -31,7 +31,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.1" />
<add key="minRev" value="132" />
<add key="minRev" value="133" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
@@ -114,7 +114,7 @@ namespace ETS_WS.WebUserControls
/// <returns></returns>
public string accoda(object stringFormat, object[] args)
{
return string.Format(stringFormat.ToString(), args);
return string.Format(stringFormat.ToString(), args).Replace("//","/");
}
/// <summary>
/// restituisce stringa del path da filesystem completo
Binary file not shown.
Binary file not shown.
@@ -31,7 +31,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.1" />
<add key="minRev" value="132" />
<add key="minRev" value="133" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
@@ -31,7 +31,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.1" />
<add key="minRev" value="132" />
<add key="minRev" value="133" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
Binary file not shown.
Binary file not shown.
@@ -31,7 +31,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.1" />
<add key="minRev" value="132" />
<add key="minRev" value="133" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
@@ -31,7 +31,7 @@
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.1" />
<add key="minRev" value="132" />
<add key="minRev" value="133" />
<add key="copyRight" value="SteamWare, ETS © 2012-2013" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
Binary file not shown.
+2 -2
View File
@@ -113,8 +113,8 @@ namespace ETS_Data
else
{
// creo
_fi.Create();
// cancello
FileStream fs= _fi.Create();
fs.Close();
_fi.Delete();
answ = true;
}
Binary file not shown.
Binary file not shown.