Merge branch 'master' of yavsc

This commit is contained in:
Paul Schneider 2015-10-02 15:39:51 +02:00
commit 8042031871
36 changed files with 1682 additions and 54 deletions

View file

@ -312,7 +312,7 @@ namespace Yavsc.Controllers
AvatarFile.ContentType, "image/png"));
}
/* Sync the property in the Profile model to display :
* string cAvat = HttpContext.Profile.GetPropertyValue ("avatar") as string;
* string cAvat = HttpContext.Profile.GetPropertyValue ("Avatar") as string;
if (cAvat != null) if (model.avatar == null) model.avatar = cAvat;
*/
if (ModelState.IsValid) {

View file

@ -69,6 +69,11 @@ namespace Yavsc.Controllers
}
}
public ActionResult ChooseMedia(long id)
{
return View ();
}
/// <summary>
/// Blogs the list.
/// </summary>