Warren
|
045ece0f70
|
After latest V8 merge - update the CSProj to remove the files that I nuked earlier
|
2018-07-31 10:19:04 +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 |
|
ashallcross
|
02b6b77d38
|
Updated links in readme file (#2822)
Updated the links from our.umbraco.org > our.umbraco.com also the case study and cloud links
|
2018-07-31 10:39:51 +02:00 |
|
Shannon
|
6e36755de5
|
updates gitignore
|
2018-07-31 15:37:47 +10:00 |
|
Shannon
|
190b16626f
|
updates gitignore
|
2018-07-31 15:26:09 +10:00 |
|
Shannon
|
ecc83595c8
|
minor merge fixes
|
2018-07-31 15:12:49 +10:00 |
|
Shannon
|
d073e727cb
|
minor merge fixes
|
2018-07-31 15:11:31 +10:00 |
|
Shannon
|
b96e1343c2
|
renames lang files back to correct cased folder... now we'll see if merging detects renames
|
2018-07-31 15:00:56 +10: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 |
|
Shannon
|
814e4c781f
|
testing rename change
|
2018-07-31 14:44:23 +10:00 |
|
Shannon
|
5ef067b5f0
|
More manual merges
|
2018-07-31 13:05:54 +10:00 |
|
Shannon
|
c36a1e4537
|
Fixes issue with pre-value models due to data type refactor (has been already fixed in other temp branches)
|
2018-07-31 12:50:30 +10:00 |
|
Shannon
|
f4342ed9cb
|
Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI/web.Template.Debug.config
|
2018-07-31 12:34:03 +10:00 |
|
Shannon
|
8517a8e088
|
fixes tests
|
2018-07-31 12:19:12 +10:00 |
|
Shannon
|
d3c45bc90f
|
lang files merged
|
2018-07-31 11:26:27 +10:00 |
|
Warren
|
bee2c2dd16
|
Merge remote-tracking branch 'origin/temp8' into temp8-serilog
# Conflicts:
# src/Umbraco.Web.UI/web.Template.Debug.config
|
2018-07-30 16:42:15 +01:00 |
|
Warren
|
cd2a70a520
|
Get logger to output as same file as old Log4Net and in same format (only diff currently is the log level type in the log file)
Ensures we use the calling type in the Umbraco ILogger and passes it onto Serilog
|
2018-07-30 16:36:38 +01:00 |
|
Sebastiaan Janssen
|
3a0c872587
|
Merge pull request #2631 from poornimanayar/U4-8617
check for recursive value
|
2018-07-30 17:30:47 +02:00 |
|
Steven Harland
|
92b11bf966
|
Increase z-index of .umb-nav-tabs (#2566)
This lowers the chances of property editors overlapping the tab overflow menu.
More info here: http://issues.umbraco.org/issue/U4-11185
|
2018-07-30 17:10:50 +02:00 |
|
Steven Harland
|
a7f68fa3d3
|
Add margin and padding to tabs dropdown (#2560)
This reduces the space between the active tab and tab content so that they bleed into each other.
More info here: http://issues.umbraco.org/issue/U4-11181
|
2018-07-30 17:03:53 +02:00 |
|
Sebastiaan Janssen
|
f59104a6f1
|
Merge pull request #2810 from AnthonyCogworks/refactor-obsolete-sweep4
v8hackathon Refactor obsolete sweep4 [v8hackaton]
|
2018-07-30 16:31:18 +02:00 |
|
Sebastiaan Janssen
|
3c2e84fdae
|
Merge pull request #2807 from AnthonyCogworks/refactor-obsolete-sweep3
v8hackathon Refactored out some obsolete methods and files. [v8hackaton]
|
2018-07-30 16:29:32 +02:00 |
|
Sebastiaan Janssen
|
9397b34e35
|
Merge pull request #2805 from AnthonyCogworks/refactor-obsolete-sweep2
v8hackathon Refactor obsolete sweep2 [v8hackaton]
|
2018-07-30 16:27:39 +02:00 |
|
Sebastiaan Janssen
|
2613d0b5ac
|
Pass UrlProvider in from grid editor too
|
2018-07-30 16:18:59 +02:00 |
|
Sebastiaan Janssen
|
5a5ce293d2
|
Merge branch 'refactor-obsolete-sweep2' of https://github.com/AnthonyCogworks/Umbraco-CMS into AnthonyCogworks-refactor-obsolete-sweep2
|
2018-07-30 16:12:45 +02:00 |
|
Sebastiaan Janssen
|
4a1113307e
|
Merge pull request #2802 from AnthonyCogworks/refactor-obsolete-mark2
v8hackathon Refactor obsolete mark2 [v8hackaton]
|
2018-07-30 16:10:52 +02:00 |
|
Sebastiaan Janssen
|
86acf0c1ad
|
Revert "enable use of radiobuttonlist pre editor"
This reverts commit 80412f56ee.
|
2018-07-30 15:46:34 +02:00 |
|
Sebastiaan Janssen
|
2ea5a7a293
|
Make radiobuttonlist work with configs as well
Re: https://github.com/umbraco/Umbraco-CMS/pull/2763#issuecomment-408848485
|
2018-07-30 15:46:02 +02:00 |
|
Shannon
|
fbc4820ab4
|
Fixes migrations and updates the api usages for v8, more manual merging of files
|
2018-07-30 23:23:01 +10:00 |
|
Shannon
|
3a487e447b
|
moves migrations
|
2018-07-30 22:25:29 +10:00 |
|
Stephan
|
ff607aef7a
|
Remove obsolete stuff
|
2018-07-30 14:04:02 +02:00 |
|
Shannon
|
10db2834aa
|
committing new migrations from v7 so we can properly rename them on next commit
|
2018-07-30 21:36:15 +10:00 |
|
Sebastiaan Janssen
|
8dc3b032b7
|
Removes unmaintained cleanup scripts and unused git installer
|
2018-07-30 13:34:45 +02:00 |
|
Sebastiaan Janssen
|
7aa9ae8771
|
Cleanup: remove Teamcity test runner
|
2018-07-30 13:34:10 +02:00 |
|
Shannon
|
a83ea47c25
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# build/NuSpecs/tools/Web.config.install.xdt
# src/Umbraco.Core/Constants-Conventions.cs
# src/Umbraco.Core/DatabaseContext.cs
# src/Umbraco.Core/Models/Rdbms/LanguageDto.cs
# src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
# src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
# src/Umbraco.Core/PropertyEditors/PreValueField.cs
# src/Umbraco.Core/PropertyEditors/SupportTagsAttribute.cs
# src/Umbraco.Core/Services/FileService.cs
# src/Umbraco.Core/Services/IFileService.cs
# src/Umbraco.Core/Strategies/RelateOnTrashHandler.cs
# src/Umbraco.Tests/App.config
# src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
# src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
# src/Umbraco.Web.UI.Client/src/less/hacks.less
# src/Umbraco.Web.UI.Client/src/less/property-editors.less
# src/Umbraco.Web.UI.Client/src/less/variables.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
# src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.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/prevalueeditors/multivalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.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.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/tags/tags.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
# src/Umbraco.Web.UI/Views/Web.config
# src/Umbraco.Web.UI/umbraco/Install/Views/Web.config
# 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/nl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/TemplateController.cs
# src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
# src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
# src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
# src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ValueListPreValueEditor.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
# src/Umbraco.Web/Trees/MediaTreeController.cs
# src/umbraco.MacroEngines/Resources/Web.config
# src/umbraco.cms/Actions/ActionRestore.cs
# src/umbraco.editorControls/yesno/YesNoDataType.cs
|
2018-07-30 21:31:35 +10:00 |
|
Stephan
|
2ce9d9f7dc
|
Fix medias (broken by removing not-so-obsolete method)
|
2018-07-30 13:27:35 +02:00 |
|
Sebastiaan Janssen
|
4a77afd3c8
|
Cleanup tests that don't work and have been ignored for years
Also means we don't need ctt.exe any more
|
2018-07-30 13:24:46 +02:00 |
|
Sebastiaan Janssen
|
fd6582f066
|
Removes unused Umbraco.MSBuild.Tasks
|
2018-07-30 13:20:13 +02:00 |
|
Sebastiaan Janssen
|
6f409fdec2
|
Merge pull request #2803 from callumbwhyte/query-builder-updates
V8 Hackathon: Query builder updates [v8hackaton]
|
2018-07-30 12:43:49 +02:00 |
|
Sebastiaan Janssen
|
d03152c4f1
|
Merge pull request #2809 from LottePitcher/patch-1
Update v8_getting_started.md after v8 hackathon [v8hackaton]
|
2018-07-30 12:28:23 +02:00 |
|
Sebastiaan Janssen
|
09d65a5aae
|
Merge pull request #2815 from Mundairson/dev-v7-U4-11540
U4-11540 Removing Warning CS0105 - The using directive appeared previously in this namespace
|
2018-07-30 12:27:27 +02:00 |
|
Sebastiaan Janssen
|
cd601d8ada
|
Revert whitespace changes
|
2018-07-30 12:25:18 +02:00 |
|
Sebastiaan Janssen
|
29ae78b1a0
|
Merge branch 'dev-v7-U4-11540' of https://github.com/Mundairson/Umbraco-CMS into Mundairson-dev-v7-U4-11540
|
2018-07-30 12:17:52 +02:00 |
|
Sebastiaan Janssen
|
4cefd355ec
|
Merge pull request #2811 from imranhaidercogworks/update-our-umbraco-url-references
Update our umbraco url references [v8hackaton]
|
2018-07-30 11:42:25 +02: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 |
|
Sebastiaan Janssen
|
c8cc5278f3
|
Merge branch 'update-our-umbraco-url-references' of https://github.com/imranhaidercogworks/Umbraco-CMS into imranhaidercogworks-update-our-umbraco-url-references
|
2018-07-30 11:20:32 +02:00 |
|
BatJan
|
60c66823f8
|
Fix for PR #2792 - Selected color does not show in document type (#2817)
|
2018-07-30 10:11:57 +02:00 |
|
Sebastiaan Janssen
|
6a946c8a1c
|
Merge pull request #2816 from BatJan/features/temp-U4-11541
U4-11541 - Change the color pickers "active" appearance
|
2018-07-30 10:11:15 +02:00 |
|
Sebastiaan Janssen
|
960755b22c
|
Merge pull request #2818 from BatJan/patch-3
Adding danish translations for labels added in PR #2342
|
2018-07-30 09:39:00 +02:00 |
|