yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,783 Commits 4 Branches 7 Tags
ee654d089600952ae23167df2f02e6541a7eca7d
Commit Graph

4104 Commits

Author SHA1 Message Date
Shannon
390514cd9d Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
#	src/Umbraco.Core/Persistence/PetaPoco.cs
#	src/Umbraco.Core/Persistence/PetaPocoSqlExtensions.cs
#	src/Umbraco.Core/Security/BackOfficeUserManager.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/FileService.cs
#	src/Umbraco.Core/Services/IFileService.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
#	src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
#	src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/routes.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/content/copy.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/config/splashes/noNodes.aspx
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/MemberTypeController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Routing/PublishedContentRequest.cs
#	src/Umbraco.Web/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
 2018-07-18 13:19:14 +10:00
Gareth Evans
ef897b2d3e Add ~/.well-known to umbracoReservedUrls to support letsencrypt/certifytheweb ootb 2018-07-17 12:25:57 +12:00
Morten Larsen
7a07649e2b Update links in the noNodes splash screen 2018-07-14 10:26:46 +02:00
Stephan
2051caaa01 Post-merge fixes 2018-07-12 18:05:48 +02:00
Sebastiaan Janssen
5a8f37ff02 Merge pull request #2767 from mikecp/mikecp-update-fr 
Synchronise fr.xml file with en.xml file + translate new stuff
 2018-07-12 13:17:11 +02:00
Michael Latouche
2a2cea0b7d Update fr.xml 2018-07-12 13:00:33 +02:00
Sebastiaan Janssen
c56dc63150 Merge pull request #2702 from nathanwoulfe/temp-U4-4732 
U4-4732 Anchor missing in TinyMCE of Umbraco 7.x
 2018-07-12 12:39:23 +02:00
Nathan Woulfe
f2fafbc631 handle manual/external links, add label to input, update placeholder 2018-07-12 11:37:04 +10:00
Shannon
ebe224fb6e Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-07-11 16:43:21 +10:00
Shannon
8521a405f7 manually merging other files 2018-07-11 16:43:09 +10:00
Shannon
7aa413d558 Merge remote-tracking branch 'origin/dev-v7' into temp8 (after fixing) 
# Conflicts:
#	build/Modules/Umbraco.Build/Build-UmbracoDocs.ps1
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Constants-Applications.cs
#	src/Umbraco.Core/Models/Rdbms/ConsentDto.cs
#	src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
#	src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs
#	src/Umbraco.Core/Services/ConsentService.cs
#	src/Umbraco.Core/Services/IRelationService.cs
#	src/Umbraco.Core/Services/RelationService.cs
#	src/Umbraco.Tests/Plugins/PluginManagerTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Services/ConsentServiceTests.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
#	src/Umbraco.Web.UI.Client/src/less/application/grid.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/less/main.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html
#	src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
#	src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
#	src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
#	src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
#	src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
#	src/Umbraco.Web.UI/config/EmbeddedMedia.config
#	src/Umbraco.Web.UI/config/trees.Release.config
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
#	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/it.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/MacroController.cs
#	src/Umbraco.Web/Editors/MemberController.cs
#	src/Umbraco.Web/Models/RegisterModel.cs
#	src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/Trees/TreeControllerBase.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.designer.cs
 2018-07-11 15:58:48 +10:00
Nathan Woulfe
f416fc6919 clear preview cookie when clicking the info-box link 2018-07-11 15:25:39 +10:00
Michael Latouche
ca13782e2a Update fr.xml 2018-07-10 13:57:40 +02:00
Stephan
9ca298543f Merge branch 'hackathon-automapper-update' of https://github.com/mzajkowski/Umbraco-CMS into temp8-2747 2018-07-10 09:37:54 +02:00
Shannon Deminick
7132ccdd99 Merge pull request #2760 from umbraco/temp8-variants 
Variants Refactoring [v8]
 2018-07-10 13:05:13 +10:00
Stephan
52be2d7864 Merge branch 'v8hackathon-library-media-remove' of https://github.com/AnthonyCogworks/Umbraco-CMS into temp-2748 2018-07-09 16:34:44 +02:00
Michael Latouche
9d5b089227 Update fr.xml 2018-07-09 13:05:15 +02:00
Mads Rasmussen
3caafc03f1 Merge branch 'temp8' into temp8-82 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2018-07-06 15:41:08 +02:00
Stephan
ef28f23c61 Renormalize 2018-07-06 12:27:39 +02:00
Stephan
fdfdd541e3 Content Url and Audit (in progress) 2018-07-06 12:20:10 +02:00
Stephan
e8aa6701ef Renormalize 2018-07-04 09:03:59 +02:00
Stephan
b3696c29cc Refactor Variants at service level 2018-07-04 08:59:50 +02:00
Mads Rasmussen
3587039406 add save and close button - show the correct button based on permissions 2018-07-03 15:55:29 +02:00
Stephan
a697608529 Fix un/publishing with variants + urls 2018-07-03 13:05:20 +02:00
Marcin Zajkowski
0a168986cb Merge branch 'temp8' into hackathon-automapper-update 2018-07-03 02:04:30 +02:00
Mads Rasmussen
451f894976 Merge branch 'temp8' into temp8-83 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2018-07-02 10:07:50 +02:00
Jonas Pyfferoen
ffccad642e Rewrite exportdocumenttype.aspx to Angular 2018-06-30 19:43:35 +02:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
Stephan
c1f3de7e5c Umbraco.Web.UI/Umbraco not /umbraco 2018-06-29 19:51:59 +02:00
Anthony
b3a8161b25 Removed library.cs and it cache settings 2018-06-29 13:56:00 +01:00
Marcin Zajkowski
449b6af70e Updated AutoMapper to the latest (7.0.1) 2018-06-29 14:54:11 +02:00
Sebastiaan Janssen
1e9e13ea6a Merge pull request #2735 from ZizZu94/dev-v7 
Italian translation of prompt, bulk and grid area
 2018-06-29 09:46:57 +02:00
Dave Woestenborghs
d9b10b294e Translated unpublish dialog 
Added translation for key added in PR #2731
 2018-06-29 08:47:20 +02:00
Sebastiaan Janssen
51fc0da379 U4-11187 - Adds friendlier "Enable JavaScript" message (#2568) 2018-06-28 20:30:52 +02:00
Sebastiaan Janssen
0a29ad3d21 Merge pull request #2570 from AndyButland/u4-10502 
U4-10502 - resend of user invitations
 2018-06-28 20:28:24 +02:00
Sebastiaan Janssen
f7517fa64b Revert whitespace changes and csproj file 2018-06-28 20:01:44 +02:00
Anders Brohus
9c8d73dcfa U4-11372 - Make history section on Info tab translatable (#2650) 2018-06-28 19:49:28 +02:00
OptimisticCoder
ffd0adb0f3 U4-9544 Added database schema validation health check and language file updates. (#2674) 2018-06-28 19:37:28 +02:00
Sebastiaan Janssen
477245ee71 Merge pull request #2731 from nathanwoulfe/temp-U4-9379 
U4 9379 - add confirmation step to unpublish action
 2018-06-28 19:31:54 +02:00
Sebastiaan Janssen
5fa5f90bfc Merge pull request #2544 from Mivaweb/patch-2 
Update NL.xml with missing translations
 2018-06-28 12:20:54 +02:00
Mads Rasmussen
f402b9e449 update labels on generate models buttons when using infinite editing 2018-06-28 10:57:09 +02:00
Nathan Woulfe
70aeb1c09d add en variants for unpublish notification 2018-06-28 10:13:01 +10:00
BatJan
476e33bf40 Changed "Denne tekst vil blive brugt..." to "Denne tekst bruges..." 
Lowering the lix count for the sentence :-)
 2018-06-26 20:04:40 +02:00
BatJan
59d68a7fdc Changed "antaller" to "antal 2018-06-26 20:02:25 +02:00
BatJan
b3d2e49f1a Adjusting translations 
I just noticed a few untranslated words and I also took the liberty to change the translation of "grid" to "gitter" and translate it back to english. "Gitter layout" is not something we say in dansih we simply adopt the english word "Grid" :-)
 2018-06-26 19:29:09 +02:00
Ed Parry
f6efbcf99f Added the Danish translations. 2018-06-26 16:26:15 +01:00
Mads Rasmussen
96fada7586 add translations 2018-06-26 14:00:29 +02:00
ZizZu94
ff5bda551c Done italian translation of grid area 2018-06-25 18:34:17 +02:00
ZizZu94
63a72090a4 Done italian translation of prompt and bulk area 2018-06-25 17:23:32 +02:00
leekelleher
2c28c82b06 Enhanced (basic) styling 
- Inline style for the link, to ensure underlined
- Added logo for branding
- Relocated to inside the #contentcolumn container tag, otherwise we hit a CSS conflict (due to `position:absolute` of the container)
 2018-06-25 11:01:44 +01:00