From 6687b54b6f43f99f39ded45fe4e2e9475fb54b23 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 9 May 2013 10:51:01 +0200 Subject: [PATCH] refresh ed aggiunta (iniziale) master e css da ETS_WS --- .gitignore | 11 +++- ETS_Data/obj/Debug/ETS_Data.dll | Bin 444928 -> 444928 bytes PROJ-ETS/PROJ-ETS/Global.asax.cs | 4 +- PROJ-ETS/PROJ-ETS/PROJ-ETS.csproj | 55 +++++------------- PROJ-ETS/PROJ-ETS/Site.Master | 19 +----- PROJ-ETS/PROJ-ETS/bin/PROJ-ETS.dll | Bin 18432 -> 11264 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 27206 -> 27200 bytes .../PROJ-ETS.csproj.FileListAbsolute.txt | 18 ------ PROJ-ETS/PROJ-ETS/obj/Debug/PROJ-ETS.dll | Bin 18432 -> 11264 bytes PROJ-ETS/PROJ-ETS/obj/Debug/build.force | 0 .../readme.txt | 16 ++--- 11 files changed, 33 insertions(+), 90 deletions(-) delete mode 100644 PROJ-ETS/PROJ-ETS/obj/Debug/build.force diff --git a/.gitignore b/.gitignore index 95b4e06..6ea9f64 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,13 @@ /ETS_Data/bin/WinLab /ETS_Data/obj/Release /ETS_Data/obj/ETS/Package/PackageTmp/* -/ETS_Data/obj/ETS/*.pdb \ No newline at end of file +/ETS_Data/obj/ETS/*.pdb + +#-------------------------------------------- +# PROJ-ETS +#-------------------------------------------- +/PROJ-ETS/bin/Debug +/PROJ-ETS/bin/WinLab +/PROJ-ETS/obj/Release +/PROJ-ETS/obj/ETS/Package/PackageTmp/* +/PROJ-ETS/obj/ETS/*.pdb \ No newline at end of file diff --git a/ETS_Data/obj/Debug/ETS_Data.dll b/ETS_Data/obj/Debug/ETS_Data.dll index 1dd2c8af724035360837672ec4d51ee60a81bf87..6363b77026bd3c812477d056c1139250134bb6f5 100644 GIT binary patch delta 107 zcmZpeBHb`WdO`=2O=4qLYZqf{7gK8&b88n%YZvR*F1AgR1g?Hg@mUv~>(-PM`tpYB zgZewW92QmNw6A;TVGBB*U$HuVc02@P4uuJf_iBiVPIF>ogw^Kj1YzK?c K_5%ml95?}{=O=vt delta 107 zcmZpeBHb`WdO`=&^{B?K)-J}@E~eHl=GHEj)-KkqU2K~s3Fx!3Y4Y!#=ezU1>-7aM zp37|anat*)t8+c7JCFegn1EP@k%3{&JvN3l2iO>bf?a|a-P+%9`{yE;2~3?AmVUl9 LbNhh - - - - - + + + + + @@ -226,10 +226,10 @@ Designer + - About.aspx ASPXCodeBehind @@ -237,41 +237,6 @@ About.aspx - - Login.aspx - ASPXCodeBehind - - - Login.aspx - - - Manage.aspx - ASPXCodeBehind - - - Manage.aspx - - - OpenAuthProviders.ascx - ASPXCodeBehind - - - OpenAuthProviders.ascx - - - Register.aspx - ASPXCodeBehind - - - Register.aspx - - - RegisterExternalLogin.aspx - ASPXCodeBehind - - - RegisterExternalLogin.aspx - Contact.aspx @@ -312,12 +277,18 @@ ViewSwitcher.ascx + + AjaxSimpleFull.Master + + + AjaxSimpleFull.Master + + - diff --git a/PROJ-ETS/PROJ-ETS/Site.Master b/PROJ-ETS/PROJ-ETS/Site.Master index 2d17a3a..0a132d2 100644 --- a/PROJ-ETS/PROJ-ETS/Site.Master +++ b/PROJ-ETS/PROJ-ETS/Site.Master @@ -41,24 +41,7 @@

-
- - - - - -

- Hello, - - ! - -

-
-
-
+