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

195 Commits

Author SHA1 Message Date
Bjarke Berg
a54e10bc13 Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/merge-v8-18-01-2021 
# Conflicts:
#	.gitignore
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/BackOfficeElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IBackOfficeSection.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/IO/SystemFiles.cs
#	src/Umbraco.Core/Models/ContentBase.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Persistence/UmbracoDatabaseExtensions.cs
#	src/Umbraco.Core/Runtime/CoreRuntime.cs
#	src/Umbraco.Core/RuntimeOptions.cs
#	src/Umbraco.Core/RuntimeState.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComponent.cs
#	src/Umbraco.Core/Telemetry/TelemetryMarkerComposer.cs
#	src/Umbraco.Examine/Umbraco.Examine.csproj
#	src/Umbraco.Infrastructure/HostedServices/ReportSiteTask.cs
#	src/Umbraco.Infrastructure/Install/InstallStepCollection.cs
#	src/Umbraco.Infrastructure/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseBuilder.cs
#	src/Umbraco.Infrastructure/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Infrastructure/Runtime/SqlMainDomLock.cs
#	src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/ContentTypeRepositoryTest.cs
#	src/Umbraco.Tests/Runtimes/CoreRuntimeTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/TestDatabase.cs
#	src/Umbraco.Web.BackOffice/Controllers/BackOfficeServerVariables.cs
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.controller.js
#	src/Umbraco.Web.UI.NetCore/Views/Partials/Grid/Editors/TextString.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web/Composing/CompositionExtensions/Installer.cs
#	src/Umbraco.Web/Editors/PreviewController.cs
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/JavaScript/PreviewInitialize.js
#	src/Umbraco.Web/Telemetry/TelemetryComponent.cs
#	src/Umbraco.Web/UmbracoApplication.cs
 2021-01-18 16:06:23 +01:00
vidyesh-local-VS
90d1e8546a Corrected branch name with latest 2020-12-05 02:18:25 +01:00
Bjarke Berg
c88c842d47 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.github/workflows/codeql-analysis.yml
#	src/Umbraco.Core/CompositionExtensions.cs
#	src/Umbraco.Core/Constants-AppSettings.cs
#	src/Umbraco.Core/GuidUdi.cs
#	src/Umbraco.Core/Models/PublishedContent/IPublishedContent.cs
#	src/Umbraco.Core/PublishedContentExtensions.cs
#	src/Umbraco.Core/Routing/DefaultUrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProvider.cs
#	src/Umbraco.Core/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Core/Runtime/MainDom.cs
#	src/Umbraco.Core/Services/IRuntimeState.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Core/Sync/DatabaseServerRegistrar.cs
#	src/Umbraco.Core/Sync/IServerRegistrar.cs
#	src/Umbraco.Infrastructure/Media/EmbedProviders/Instagram.cs
#	src/Umbraco.Infrastructure/Models/ContentBaseExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Tests/Misc/ApplicationUrlHelperTests.cs
#	src/Umbraco.Tests/Routing/UrlProviderTests.cs
#	src/Umbraco.Tests/Routing/UrlsWithNestedDomains.cs
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
#	src/Umbraco.Web/CompositionExtensions.cs
#	src/Umbraco.Web/HtmlHelperBackOfficeExtensions.cs
#	src/Umbraco.Web/ImageCropperTemplateExtensions.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Runtime/WebInitialComponent.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoContext.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/UmbracoInjectedModule.cs
 2020-11-30 11:24:24 +01:00
Sebastiaan Janssen
930b1c1a75 Run analysis for bug fixes & features 2020-11-23 11:47:25 +01:00
Sebastiaan Janssen
2b6b9b8c06 Keep getting complaints that there's no on in codeql-config.yml 2020-11-23 11:35:52 +01:00
Joe Glombek
d60f14708b Update new list of Core Collaborators in contributing docs (#9413) 
* Update new list of Core Collaborators in contributing docs

* Fix spacing
 2020-11-18 16:12:01 +00:00
Sebastiaan Janssen
333aaec1e3 Might fix running out of memory? 2020-11-12 11:52:45 +01:00
Sebastiaan Janssen
9c6b7a6578 Run analysis on pushes AND PRs to the contrib and dev branches 2020-11-12 11:42:37 +01:00
Sebastiaan Janssen
f295b539a1 Adding a config file maybe? 2020-11-12 11:14:34 +01:00
Sebastiaan Janssen
285e51dd37 Should it be here then? 2020-11-12 10:55:50 +01:00
Sebastiaan Janssen
49c9330e28 Get CodeQL to only scan the relevant directories 2020-11-12 10:49:21 +01:00
Sebastiaan Janssen
05ef43d732 Disable CodeQL for now while we figure out why it doesn't work 2020-11-09 11:30:33 +01:00
Marc Goodson
034e9e2628 Update 'working with the code' to remove reference to VS2017 
I'm not sure you need to restate the version here, having got it specified in the list above, but if you do, then a vanilla 2017 won't build the source because of the c#8 stuff introduced recently.
 2020-10-05 10:43:32 +02:00
Lotte Pitcher
9e48e8aa3a use 'contact links' config feature to replace issue templates that link elsewhere 2020-10-01 15:01:44 +02:00
Bjarke Berg
d14e2a99bc Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.gitignore
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Infrastructure/Intall/InstallHelper.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockEditorModel.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockItemData.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockListLayoutReference.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockListConfigurationEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
 2020-09-09 14:16:46 +02:00
Kenn Jacobsen
94894ca41b Bump required Visual Studio version number in contrib guidelines 2020-09-02 15:22:48 +02:00
Sebastiaan Janssen
dae94bd957 Update issue template 2020-08-27 09:46:06 +02:00
Sebastiaan Janssen
3b93b6d108 Adds .NET Core issue template 2020-08-27 09:45:13 +02:00
Bjarke Berg
9432f71a63 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-08-11 10:00:19 +02:00
Bjarke Berg
39162f0f6a Merge conflicts resolved 2020-08-06 12:59:21 +02:00
Warren Buckley
1e29b5f810 Delete RichCode Navigation GitHub Action 
Will do testing in personal fork with MS team until this is ready to demo
 2020-08-06 08:10:51 +01:00
Warren Buckley
48963f6548 Submit Rich Code Navigation GitHub action 2020-07-23 16:40:23 +01:00
Sebastiaan Janssen
d347d36861 Don't run CodeQL on PRs for now 2020-07-14 13:48:46 +02:00
Sebastiaan Janssen
9f9cd0e11e Trying to get CodeQL to run (#8415) 2020-07-13 17:22:27 +02:00
Sebastiaan Janssen
19ec14b53f Create codeql-analysis.yml 
First stab at getting CodeQL analysis running
 2020-07-10 08:57:41 +02:00
Bjarke Berg
aa31a8b5dd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
#	src/Umbraco.Core/PublishedCache/PublishedSnapshotServiceBase.cs
#	src/Umbraco.Core/PublishedModelFactoryExtensions.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/Umbraco/Views/Default.cshtml
 2020-05-01 14:13:15 +02:00
Warren Buckley
9335f39495 Update Readme.md in netcore branch to see if LGTM.com will analyze C# 2020-04-18 22:01:39 +01:00
James Wilkinson
d6723554fc Added links to the required tools. Added more detail to the PR… (#7944) 2020-04-14 09:50:48 +02:00
Carole Rennie Logan
18e4299fb3 Adding Git command line to contrib guidelines 
Adding Git command line to contrib guidelines after an issue someone had at #canConHackathon
 2020-04-10 20:46:46 +02:00
Carole Rennie Logan
421d7ac30d Renaming PR team name in contributing docs 2020-04-10 17:26:50 +02:00
Daniël Knippers
3d10a061e9 Update CONTRIBUTING.md (#7680) 
* Update CONTRIBUTING.md

Syncs header name with summary and fixes link syntax

* Update CONTRIBUTING.md

Changed header back and updated summary instead
 2020-02-18 14:05:07 +00:00
Poornima Nayar
05465f2e91 Merge pull request #7092 from JeffreyPerplex/patch-5 
Make the source code build documentation a bit less complex
 2020-02-17 15:37:19 +00:00
Poornima Nayar
eed94d8cd0 Change to default branch name for v8 2020-01-16 09:21:26 +01:00
Jeffrey Schoemaker
ce969aad3b Make it a bit less complex 2019-11-07 13:34:26 +01:00
Jeffrey Schoemaker
55b76ecc4e Add some help if you're on the wrong repo (#7082) 2019-11-07 12:46:48 +01:00
Sebastiaan Janssen
60e4727e51 Update CONTRIBUTING.md 2019-11-07 12:05:16 +01:00
Jeffrey Schoemaker
2bbe2c01de Added to switch to the correct repository 
I always forget this.... And it's nowhere in the documentation
 2019-11-07 10:48:00 +00:00
Sebastiaan Janssen
4e908e9dd1 Update 1_Bug.md 2019-11-01 15:23:53 +01:00
SANDIP PALIT
5f83f199cb Fixed Grammatical errors (#6857) 2019-10-29 21:52:45 +01:00
emma burstow
3871f408de Update CONTRIBUTING.md 
I know it's cheesy to update a .md for hacktoberfest but I have been dying to put some things in here and to switch some things around. Perhaps you'll disagree on the 'easiest way to build the source code' but I wanted to invert the two because I find clicking lots easier.
 2019-10-23 17:21:10 +02:00
James George
a3779b5be9 [Docs]: minor tweak (#6743) 2019-10-17 13:06:21 +02:00
Kewbish
86c6b3d7f8 Grammar changes 
There were a few grammatical mistakes and one spelling error in
the various .md files, so I fixed them :)
Signed-off-by: Kewbish <kewbish@gmail.com>
 2019-10-16 17:32:51 +02:00
Poornima Nayar
157c0a2479 Added Review process file 2019-09-02 10:27:29 +02:00
Poornima Nayar
981519eac0 Added contribution guidelines file 
which was otherwise leading to a 404 from the Contributing.md file (#6197)
 2019-08-29 13:49:26 +02:00
Sebastiaan Janssen
943b54dcf7 Update 1_Bug.md 2019-07-11 11:55:01 +02:00
Mike Masey
6d6121faa6 feat: add updated defaultbranch image and update missed dev-v8 references to v8/dev 2019-04-02 20:47:47 +01:00
Mike Masey
9d4ecc1d41 fix: update contributing.md with correct branch to rebase with (v8/dev) 2019-04-02 20:09:03 +01:00
Sebastiaan Janssen
1c9d1718e7 More readme updates 2019-03-19 22:53:31 +01:00
Sebastiaan Janssen
23656f017c More readme updates 2019-03-19 22:02:52 +01:00
Sebastiaan Janssen
685c4e351b Update readme 2019-03-19 21:31:57 +01:00