68db41fe9358babff39b9954b95489e7f4e4d4cc
7 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
elitsa
|
fc0f996500 | Excluding no longer needed paths. | ||
|
Elitsa Marinovska
|
880e86820e | Updating with correct directory refferences | ||
|
Elitsa Marinovska
|
3b22480b5d | Update with correct paths | ||
|
Shannon
|
c3736ce7ab |
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts: # .github/README.md # build.bat # src/Umbraco.Core/Migrations/Expressions/Alter/Table/AlterTableBuilder.cs # src/Umbraco.Core/Migrations/Expressions/Create/Column/CreateColumnBuilder.cs # src/Umbraco.Core/Migrations/Expressions/Create/Index/CreateIndexBuilder.cs # src/Umbraco.Core/Migrations/Expressions/Create/Table/CreateTableBuilder.cs # src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DefinitionFactory.cs # src/Umbraco.Core/Persistence/DatabaseModelDefinitions/IndexDefinition.cs # src/Umbraco.Core/Persistence/Factories/MediaFactory.cs # src/Umbraco.Core/Persistence/Migrations/Syntax/Alter/Column/AlterColumnBuilder.cs # src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs # src/Umbraco.Core/Persistence/Repositories/UserRepository.cs # src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs # src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs # src/Umbraco.Core/Services/EntityService.cs # src/Umbraco.Core/Services/IMediaService.cs # src/Umbraco.Core/Services/MediaService.cs # src/Umbraco.Core/Services/NotificationService.cs # src/Umbraco.Web.UI.Client/bower.json # 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/directives/validation/valtab.directive.js # src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js # src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js # src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js # src/Umbraco.Web.UI.Client/src/less/main.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/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/content/copy.html # src/Umbraco.Web.UI.Client/src/views/content/emptyrecyclebin.html # src/Umbraco.Web.UI.Client/src/views/content/move.html # src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html # src/Umbraco.Web.UI.Client/src/views/datatypes/move.html # src/Umbraco.Web.UI.Client/src/views/documenttypes/copy.html # src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html # src/Umbraco.Web.UI.Client/src/views/documenttypes/move.html # src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.controller.js # src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html # src/Umbraco.Web.UI.Client/src/views/media/move.html # src/Umbraco.Web.UI.Client/src/views/mediatypes/copy.html # src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html # src/Umbraco.Web.UI.Client/src/views/mediatypes/move.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.prevalues.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/radiobuttons/radiobuttons.html # src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html # src/Umbraco.Web.UI/Umbraco/config/lang/da.xml # src/Umbraco.Web.UI/Umbraco/config/lang/fr.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/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/Macros/editMacro.aspx # src/Umbraco.Web.UI/Umbraco/dialogs/ChangeDocType.aspx # 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/dialogs/editMacro.aspx # src/Umbraco.Web/Controllers/UmbLoginController.cs # src/Umbraco.Web/Editors/ContentControllerBase.cs # src/Umbraco.Web/Editors/ContentTypeController.cs # src/Umbraco.Web/Editors/MediaController.cs # src/Umbraco.Web/Editors/PasswordChanger.cs # src/Umbraco.Web/HttpRequestExtensions.cs # src/Umbraco.Web/Models/ContentEditing/Tab.cs # src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs # src/Umbraco.Web/Templates/TemplateRenderer.cs # src/Umbraco.Web/Trees/ApplicationTreeController.cs # src/Umbraco.Web/Trees/ContentTreeController.cs # src/Umbraco.Web/Trees/ContentTreeControllerBase.cs # src/Umbraco.Web/Trees/MediaTreeController.cs # src/Umbraco.Web/_Legacy/Controls/TabView.cs # src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs # src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs # src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs # src/Umbraco.Web/umbraco.presentation/umbraco/settings/editLanguage.aspx.cs # src/umbraco.cms/Actions/Action.cs # src/umbraco.providers/members/UmbracoMembershipProvider.cs |
||
|
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 |
||
|
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 |
||
|
Stephan
|
fc56126820 | Cleanup Solution |