diff --git a/dnx-install.sh b/dnx-install.sh new file mode 100644 index 00000000..b09ab788 --- /dev/null +++ b/dnx-install.sh @@ -0,0 +1,30 @@ + +set -e + +# config +export DNX_USER_HOME="`pwd -P`/dnx" + +# rt +mkdir -p dnx/runtimes +cd dnx/runtimes +curl --insecure -sSL https://lua.pschneider.fr/files/Paul/dnx-mono.1.0.0-rc1-update2.tar.bz2 |tar xj +cd .. + +# dnvm +mkdir -p dnvm +cd dnvm +curl --insecure -sSL https://lua.pschneider.fr/files/Paul/dnvm.sh >dnvm.sh +cd .. + +# alias +mkdir -p alias +echo "dnx-mono.1.0.0-rc1-update2" >alias/default.alias +. dnvm/dnvm.sh + +# end +cd .. + +echo "DNX a été ressucité dans $DNX_USER_HOME" +echo "Pour utiliser dnx et dnu:" +echo " . ${DNX_USER_HOME}/dnvm/dnvm.sh" + diff --git a/src/Yavsc.Abstract/Attributes/Validation/YaStringLength.cs b/src/Yavsc.Abstract/Attributes/Validation/YaStringLength.cs index 926a406a..a1193614 100644 --- a/src/Yavsc.Abstract/Attributes/Validation/YaStringLength.cs +++ b/src/Yavsc.Abstract/Attributes/Validation/YaStringLength.cs @@ -16,7 +16,6 @@ namespace Yavsc.Attributes.Validation this.maxLen = maxLen; this.MinimumLength=minLen; UseDefaultErrorMessage(); - } void UseDefaultErrorMessage() { diff --git a/src/Yavsc/Controllers/Contracting/FrontOfficeController.cs b/src/Yavsc/Controllers/Contracting/FrontOfficeController.cs index 8b865a80..80e1dd86 100644 --- a/src/Yavsc/Controllers/Contracting/FrontOfficeController.cs +++ b/src/Yavsc/Controllers/Contracting/FrontOfficeController.cs @@ -68,6 +68,7 @@ namespace Yavsc.Controllers var result = _context.ListPerformers(_billing, id); return View(result); } + [AllowAnonymous] public ActionResult HairCut(string id) { @@ -79,7 +80,6 @@ namespace Yavsc.Controllers var result = _context.ListPerformers(_billing, id); return View(result); } - [Produces("text/x-tex"), Authorize, Route("estimate-{id}.tex")] diff --git a/src/Yavsc/Resources/Yavsc.Models.Musical.Profiles.Instrumentation.resx b/src/Yavsc/Resources/Yavsc.Models.Musical.Profiles.Instrumentation.resx new file mode 100644 index 00000000..24075a23 --- /dev/null +++ b/src/Yavsc/Resources/Yavsc.Models.Musical.Profiles.Instrumentation.resx @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Pas d'instrument + Instrumentation + \ No newline at end of file diff --git a/src/Yavsc/Resources/Yavsc.YavscLocalisation.resx b/src/Yavsc/Resources/Yavsc.YavscLocalisation.resx index d3633bbc..5ff5583b 100644 --- a/src/Yavsc/Resources/Yavsc.YavscLocalisation.resx +++ b/src/Yavsc/Resources/Yavsc.YavscLocalisation.resx @@ -422,6 +422,7 @@ Au vu de son calendrier, {0} devrait être disponible pour ce rendez-vous Paramètres musicien (l'instrument) + Paramètres Dj (le compte SoundCloud.com) Paramètres formation (les partenaires) Paramètres généraux (visibilité et présentation) diff --git a/src/Yavsc/Views/Shared/Yavsc.Models.Haircut.BrusherProfile.cshtml b/src/Yavsc/Views/FrontOffice/Yavsc.Models.Haircut.BrusherProfile.cshtml similarity index 100% rename from src/Yavsc/Views/Shared/Yavsc.Models.Haircut.BrusherProfile.cshtml rename to src/Yavsc/Views/FrontOffice/Yavsc.Models.Haircut.BrusherProfile.cshtml diff --git a/src/Yavsc/Views/FrontOffice/Yavsc.Models.Musical.Profiles.Instrumentation.cshtml b/src/Yavsc/Views/FrontOffice/Yavsc.Models.Musical.Profiles.Instrumentation.cshtml new file mode 100644 index 00000000..641c45ce --- /dev/null +++ b/src/Yavsc/Views/FrontOffice/Yavsc.Models.Musical.Profiles.Instrumentation.cshtml @@ -0,0 +1,20 @@ +@model Yavsc.Models.Musical.Profiles.Instrumentation + + +@if (Model == null) { +

@SR["NoInstrument"]

+} +@if (Model != null) { +
+@SR["Instrumentation"] + +
+
+ @Html.DisplayNameFor(model => model.Tool) +
+
+ @Html.DisplayFor(model => model.Tool) +
+
+
+} \ No newline at end of file