Shannon
c6a67f79ac
Merge remote-tracking branch 'origin/dev-v7' into temp8
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/GlobalSettings.cs
# src/Umbraco.Core/Configuration/UmbracoConfig.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
# src/Umbraco.Core/Models/IContentTypeBase.cs
# src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
# src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
# src/Umbraco.Tests/packages.config
# src/Umbraco.Web.UI.Client/bower.json
# src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
# src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
# src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/buttons.less
# src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
# src/Umbraco.Web.UI.Client/src/less/forms.less
# src/Umbraco.Web.UI.Client/src/less/hacks.less
# src/Umbraco.Web.UI.Client/src/less/modals.less
# src/Umbraco.Web.UI.Client/src/less/panel.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
# src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
# src/Umbraco.Web.UI.Client/src/views/users/user.html
# src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
# src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/Umbraco/dialogs/protectPage.aspx
# src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
# src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
# src/Umbraco.Web.UI/config/EmbeddedMedia.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/dialogs/sort.aspx
# src/Umbraco.Web.UI/umbraco_client/Dialogs/PublishDialog.js
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs
# src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
# src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs
# src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
# src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
# src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
# src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
# src/Umbraco.Web/Templates/TemplateUtilities.cs
# src/Umbraco.Web/UmbracoHelper.cs
# src/Umbraco.Web/WebServices/SaveFileController.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
2018-10-22 16:03:01 +11:00
elitsa
85309e8ce5
Merge branch 'temp8-I3089' of https://github.com/umbraco/Umbraco-CMS into temp8-I3089
2018-10-08 10:23:53 +02:00
elitsa
e2acc8b447
Remove sections icons - not needed anymore
2018-10-08 10:00:52 +02:00
elitsa
8fdee9af85
Update trees.Release.config
2018-10-08 09:58:19 +02:00
Shannon
b48202197f
Merge remote-tracking branch 'origin/temp8' into temp8-I3089
...
# Conflicts:
# src/Umbraco.Web/Trees/DataTypeTreeController.cs
2018-10-08 09:54:12 +02:00
elitsa
99257f2245
Updated the sortOrder also in the respective controllers, as well as updating to the new standards of string interpolation in those controllers.
2018-10-05 11:51:34 +02:00
elitsa
0cc5a01069
packages section is there with translations sections and correct trees
2018-10-05 11:09:33 +02:00
Warren Buckley
5bc2954650
Merge pull request #3109 from umbraco/update-dashboards
...
Merge dashboards from Developer to Settings section
2018-10-04 11:56:14 +01:00
Thomas Adams
833137772d
Fix typo in twitter settings section of EmbeddedMedia configs
2018-10-03 15:04:33 +01:00
elitsa
83c66730e2
Updating tabs into Settings section.
2018-10-03 14:19:35 +02:00
elitsa
0e8d4eed63
Move dashboards from the Developer's section into Settings one.
2018-10-02 14:12:53 +02:00
Shannon
b96ba05d22
Merge remote-tracking branch 'origin/dev-v7' into temp8
...
# Conflicts:
# build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1
# build/NuSpecs/UmbracoCms.Core.nuspec
# build/NuSpecs/UmbracoCms.nuspec
# build/NuSpecs/tools/Readme.txt
# src/Umbraco.Core/Configuration/UmbracoConfig.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
# src/Umbraco.Core/Constants-Conventions.cs
# src/Umbraco.Core/Constants-System.cs
# src/Umbraco.Core/IO/MediaFileSystem.cs
# src/Umbraco.Core/Media/Exif/ImageFile.cs
# src/Umbraco.Core/Models/Property.cs
# src/Umbraco.Core/Models/PropertyTagBehavior.cs
# src/Umbraco.Core/Models/PropertyTags.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/SetDefaultTagsStorageType.cs
# src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
# src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
# src/Umbraco.Core/Security/AuthenticationExtensions.cs
# src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
# src/Umbraco.Core/Services/Implement/PackagingService.cs
# src/Umbraco.Core/Services/ServerRegistrationService.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Core/packages.config
# src/Umbraco.Tests/ApplicationUrlHelperTests.cs
# src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
# src/Umbraco.Tests/packages.config
# src/Umbraco.Web.UI.Client/package.json
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
# src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/user.service.js
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/components/card.less
# src/Umbraco.Web.UI.Client/src/less/navs.less
# src/Umbraco.Web.UI.Client/src/less/panel.less
# src/Umbraco.Web.UI.Client/src/less/property-editors.less
# src/Umbraco.Web.UI.Client/src/less/tree.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/infiniteeditors/mediapicker/mediapicker.controller.js
# 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/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
# src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
# src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/packages.config
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/CanvasDesignerController.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/DashboardController.cs
# src/Umbraco.Web/Editors/LogController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/Install/InstallHelper.cs
# src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
# src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
# src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs
# src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
# src/Umbraco.Web/Mvc/MasterControllerFactory.cs
# src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
# src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs
# src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
# src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
# src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
# src/Umbraco.Web/Scheduling/KeepAlive.cs
# src/Umbraco.Web/Scheduling/LogScrubber.cs
# src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
# src/Umbraco.Web/Scheduling/ScheduledTasks.cs
# src/Umbraco.Web/Scheduling/Scheduler.cs
# src/Umbraco.Web/Templates/TemplateUtilities.cs
# src/Umbraco.Web/Trees/DataTypeTreeController.cs
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/_Legacy/Packager/Installer.cs
# src/Umbraco.Web/packages.config
# src/Umbraco.Web/umbraco.presentation/keepAliveService.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
# src/umbraco.businesslogic/IO/IOHelper.cs
# src/umbraco.cms/packages.config
# src/umbraco.cms/umbraco.cms.csproj
# src/umbraco.controls/packages.config
# src/umbraco.controls/umbraco.controls.csproj
# src/umbraco.editorControls/packages.config
# src/umbraco.editorControls/umbraco.editorControls.csproj
2018-10-01 14:32:46 +02:00
Sebastiaan Janssen
093182c56d
Allow svg uploads
2018-09-30 13:12:11 +02:00
imranhaidercogworks
5f1fb144e0
Uploading SVG's Causes Error (Depending on imageFileTypes Setting) ( #3072 )
2018-09-30 13:09:44 +02:00
Stephan
612c38654d
Merge branch origin/dev-v7 into temp8
2018-09-06 13:07:09 +02:00
Warren
e0c0bc7da4
Update getting started tour template tour - to use Model.Name as opposed to older Model.Content.Name
2018-09-04 13:29:42 +01:00
Mads Rasmussen
e221a1af36
fix the rest of the create media tour
2018-09-04 13:35:31 +02:00
Mads Rasmussen
5b3b160f3b
Make header styling consistent
2018-09-04 10:27:53 +02:00
Mads Rasmussen
b8f141982b
fix create doc type tour
2018-09-04 09:42:34 +02:00
Mads Rasmussen
b72fc95d1f
fix up getting started and create content tours
2018-09-03 16:02:39 +02:00
Warren
91ab3b4894
Comments out a lot of the serilog.user.config to give some guidance and examples on what can be setup & configured
2018-08-28 10:11:08 +01:00
Sebastiaan Janssen
8666b222ac
Merge pull request #2841 from leekelleher/U4-11556
...
U4-11556 - Removed metablogConfig.config
2018-08-26 18:04:50 +02:00
Sebastiaan Janssen
49df6e7c9d
Merge branch 'U4-8550' of https://github.com/drpeck/Umbraco-CMS into drpeck-U4-8550
...
# Conflicts:
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web/PublishedContentExtensions.cs
2018-08-26 17:45:34 +02:00
Chris Houston
56de9ff4ae
Fix for issue: U4 11409 - "Create content" tour is failing when doing the tour with the starter kit installed ( #2851 )
2018-08-26 14:52:14 +02:00
Chris Houston
ba682d95dc
Small tweaks to the Getting Started tour text.
2018-08-12 01:16:57 -04:00
Warren
054308b44e
Merge remote-tracking branch 'origin/temp8-directive-cleanup' into temp8-serilog
2018-08-10 15:37:50 +01:00
Warren
212e0a091a
Allows Serilog to be configured in a serilog.user.config file that will not effect the main umbraco logger
...
Adds in support for filtering expressions - so the user logger configuration can filter by including or excluding on an expression - common use case to include only my namespace from SourceContext thjat starts with xyz
2018-08-09 22:08:40 +01:00
leekelleher
92273f263b
U4-11556 V8 - Removed metablogConfig.config
...
http://issues.umbraco.org/issue/U4-11556
For v7, I've marked the `SystemFiles.MetablogConfig` strings as deprecated.
2018-08-08 10:23:14 +01:00
Warren
6372d393ee
Merge branch 'dev-v7' into temp8 == Shan or Stephan please review this !
...
* Contains a change to work with V8 - content.notify.controller sends a string array
* C# ContentController methods reworked to newer services available & API POST is model bound to string array
# Conflicts:
# src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
# src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
# 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/dialogs/notifications.aspx
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/TemplateController.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs
2018-08-07 15:48:21 +01:00
Andy Hawken (SP4)
afa27ce872
Tour Step 7 Wording
...
Change wording of tour step 7 to "Now click on" to indicate that clicking on the avatar is a step in the tour, rather than a description of what it does at runtime
2018-08-02 13:34:30 +01:00
Warren
a460d48607
Remove mention of Log4Net
2018-07-31 15:26:38 +01:00
Warren
81095fb77d
Adds an env variable (set to process level) so that the external config can use it to save files with a relative path
2018-07-31 12:43:26 +01:00
Warren
b5f728541a
Merge remote-tracking branch 'origin/temp8' into temp8-serilog
2018-07-31 09:51:44 +01:00
Warren
5cacdeafa8
Adds in Serilog.Settings.AppSettings package
...
Configured to read from a custom .config file location as opposed to root web.config appsettings
Enable Serilog Debugging aka Selflog
2018-07-31 09:50:43 +01:00
Shannon
d272dbf611
Merge branch 'dev-v7' into temp8
...
# Conflicts:
# build/NuSpecs/tools/Readme.txt
# src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs
# src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs
# src/Umbraco.Core/Packaging/Models/PackageAction.cs
# src/Umbraco.Core/PropertyEditors/PreValueField.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
# src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
# src/Umbraco.Tests/Dependencies/NuGet.cs
# src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs
# src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
# src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml
# src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml
# src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml
# src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml
# src/Umbraco.Tests/Services/PerformanceTests.cs
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
# src/Umbraco.Web.UI.Client/src/less/navs.less
# src/Umbraco.Web.UI.Client/src/less/tree.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html
# src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
# src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
# src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
# src/Umbraco.Web.UI/Properties/Settings.Designer.cs
# src/Umbraco.Web.UI/Properties/Settings.settings
# src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
# src/Umbraco.Web.UI/config/feedProxy.Release.config
# src/Umbraco.Web.UI/config/feedProxy.config
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/umbraco/config/lang/de.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/es.xml
# src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
# src/Umbraco.Web.UI/umbraco/config/lang/he.xml
# src/Umbraco.Web.UI/umbraco/config/lang/it.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
# src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
# src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
# src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
# src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.contextmenu.js
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Install/InstallHelper.cs
# src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs
# src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
# src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
# src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
# src/Umbraco.Web/Properties/Settings.settings
# src/Umbraco.Web/Properties/Settings1.Designer.cs
# src/Umbraco.Web/Routing/PublishedContentRequest.cs
# src/Umbraco.Web/Trees/PackagesTreeController.cs
# src/Umbraco.Web/UI/LegacyDialogHandler.cs
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/Web References/org.umbraco.our/Reference.map
# src/Umbraco.Web/Web References/org.umbraco.our/repository.disco
# src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl
# src/Umbraco.Web/app.config
# src/Umbraco.Web/umbraco.presentation/item.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/DocumentExtensions.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Nodes.cs
# src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs
# src/umbraco.MacroEngines/RazorDynamicNode/DynamicNodeList.cs
# src/umbraco.businesslogic/ApplicationTree.cs
# src/umbraco.businesslogic/BasePages/BasePage.cs
# src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
# src/umbraco.editorControls/uploadfield/uploadField.cs
2018-07-31 14:57:20 +10:00
Sebastiaan Janssen
8404efc521
Adds a few updates from PR #2820 and updates feedProxy to allow both .org and .com
2018-07-30 11:38:51 +02:00
Imran Haider
2660b31370
Updated our.umbraco.org to .com
2018-07-27 16:41:57 +01:00
Imran Haider
7baca85f6a
Update ourumbraco references to https
2018-07-27 16:08:38 +01:00
Warren
9dfe53fef8
Log4Net config files removed from disk & CSProj
...
Removes references to Log4Net from Web.Config's
2018-07-27 14:15:34 +01:00
Shannon
959caf4d04
Fixes tests and merging issues, simplifies TabsAndPropertiesResolver since it doesn't need umbracocontext, only the MemberTabsAndPropertiesResolver one does
2018-07-18 15:42:12 +10:00
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
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
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
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
Stephan
7a615133ff
Renormalize
2018-06-29 19:52:40 +02:00
Anthony
b3a8161b25
Removed library.cs and it cache settings
2018-06-29 13:56:00 +01:00
Sebastiaan Janssen
677f22b008
Merge branch 'patch-v7' into dev-v7
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
2018-06-21 11:05:05 +02:00
