diff --git a/.gitignore b/.gitignore index 52035ca55..5e7dd7079 100644 --- a/.gitignore +++ b/.gitignore @@ -186,3 +186,5 @@ BlogEngine/.vs/ # Default extensions data BlogEngine/BlogEngine.NET/App_Data/datastore/extensions/*.xml +/.vs/slnx.sqlite +/.vs/BlogEngine.NET/config/applicationhost.config diff --git a/BlogEngine/BlogEngine.NET/Account/account.master b/BlogEngine/BlogEngine.NET/Account/account.master index 4b5dc3776..d68c57d68 100644 --- a/BlogEngine/BlogEngine.NET/Account/account.master +++ b/BlogEngine/BlogEngine.NET/Account/account.master @@ -6,7 +6,7 @@ Account Login - + diff --git a/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.es.resx b/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.es.resx index 07bb8aa20..146467f7c 100644 --- a/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.es.resx +++ b/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.es.resx @@ -296,6 +296,9 @@ Contactarnos + + Compartir + Formulario de Contacto @@ -1736,4 +1739,4 @@ Teléfono - \ No newline at end of file + diff --git a/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.resx b/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.resx index 6f4d132e1..1399042a3 100644 --- a/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.resx +++ b/BlogEngine/BlogEngine.NET/App_GlobalResources/labels.resx @@ -2594,4 +2594,7 @@ Change Name + + Share + \ No newline at end of file diff --git a/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/PostView.ascx b/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/PostView.ascx index 12dc6d482..66d62e749 100644 --- a/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/PostView.ascx +++ b/BlogEngine/BlogEngine.NET/Custom/Themes/Standard/PostView.ascx @@ -75,7 +75,7 @@ {%> <%=postCategory %> <% } %>
- +
diff --git a/BlogEngine/BlogEngine.NET/admin/app/editor/filemanager.cshtml b/BlogEngine/BlogEngine.NET/admin/app/editor/filemanager.cshtml index e00206541..c71228908 100644 --- a/BlogEngine/BlogEngine.NET/admin/app/editor/filemanager.cshtml +++ b/BlogEngine/BlogEngine.NET/admin/app/editor/filemanager.cshtml @@ -24,7 +24,7 @@ - + @Styles.Render("~/Content/admincss")