Shannon
|
c46d4e9e43
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
# src/Umbraco.Core/Persistence/PetaPoco.cs
# src/Umbraco.Core/Scoping/NoScope.cs
# src/Umbraco.Core/Scoping/ScopeProvider.cs
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Core/Services/IContentService.cs
# src/Umbraco.Tests/Persistence/Migrations/MigrationStartupHandlerTests.cs
# src/Umbraco.Tests/UI/LegacyDialogTests.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI/umbraco/config/create/UI.xml
# src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
# src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/MediaTypeController.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/ClickJackingCheck.cs
# src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
# src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
# src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
# src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
|
2018-04-19 23:41:35 +10:00 |
|
Sebastiaan Janssen
|
1594adf3ed
|
Makes code a bit more readable and uses ToList instead of ToArray
|
2018-04-15 22:38:09 +02:00 |
|
Shannon
|
881fbb7f76
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
# Conflicts:
# build/Modules/Umbraco.Build/Umbraco.Build.psm1
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/DatabaseContext.cs
# src/Umbraco.Core/IO/FileSystemProviderManager.cs
# src/Umbraco.Core/ObjectExtensions.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSevenZero/AddUserGroupTables.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
# src/Umbraco.Core/Services/IdkMap.cs
# src/Umbraco.Core/Services/UserService.cs
# src/Umbraco.Core/packages.config
# src/Umbraco.Tests.Benchmarks/app.config
# src/Umbraco.Tests/UI/LegacyDialogTests.cs
# src/Umbraco.Web/Cache/MediaCacheRefresher.cs
# src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
# src/Umbraco.Web/Features/DisabledFeatures.cs
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
# src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
# src/Umbraco.Web/PublishedContentQuery.cs
# src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
# src/Umbraco.Web/packages.config
# src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
|
2018-03-29 20:01:14 +11:00 |
|
Stephan
|
c2e1ba21b2
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-27 16:18:51 +02:00 |
|
Dave Woestenborghs
|
36d6b6a254
|
U4-11150 merged where statements in to one statement
|
2018-03-27 14:22:51 +02:00 |
|
Stephan
|
0a4878d2a3
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-27 10:04:07 +02:00 |
|
Dave Woestenborghs
|
29bb86ea13
|
Filter tours based on current users culture
|
2018-03-23 16:37:13 +01:00 |
|
Claus
|
b2004057a5
|
U4-10957 If RequiredSection is not defined in a tour - backoffice will throw errors
|
2018-02-09 11:55:34 +01:00 |
|
Robert
|
e07c5e6ff8
|
Removed unused using directives
|
2018-01-29 13:18:11 +01:00 |
|
Robert
|
67ff827d67
|
Tours will only load if the current user has access to the same sections the tours has access to
|
2018-01-29 13:13:43 +01:00 |
|
Robert
|
6f81b7fe24
|
'getting-started' tour only available to admins
|
2018-01-25 12:10:34 +01:00 |
|
Robert
|
6f39bac32a
|
Removed authorize attribute from TourControlle
|
2018-01-23 13:47:57 +01:00 |
|
Shannon
|
d7f2041ee9
|
Makes the TourFilterResolver a real resolver
|
2018-01-11 18:00:42 +11:00 |
|
Claus
|
ce11a377e6
|
refactor
|
2018-01-10 11:37:37 +01:00 |
|
Claus
|
c6443c477f
|
no need to log when throwing - that gets logged.
|
2018-01-10 11:13:28 +01:00 |
|
Claus
|
eb94572361
|
updating pr to fit with base.
|
2018-01-10 10:55:46 +01:00 |
|
Claus
|
fd8317493e
|
Merge branch 'dev-v7.8' into temp-U4-10707
# Conflicts:
# src/Umbraco.Web/Editors/TourController.cs
# src/Umbraco.Web/Umbraco.Web.csproj
|
2018-01-10 10:10:19 +01:00 |
|
Shannon
|
c3be9004f6
|
U4-10811 Store custom tours as json and load from App_Plugins/{MyPlugin}/backoffice/tours
|
2018-01-10 16:01:46 +11:00 |
|
Claus
|
a5ec5f46ac
|
filtering out tours.
|
2018-01-09 15:49:19 +01:00 |
|
Shannon
|
b9b1fc3a70
|
Adds a global config switch to enable/disable tours entirely
|
2017-11-09 00:57:05 +11:00 |
|
Shannon
|
1d52f59657
|
Puts tours on the file system and loads them from an api controller
|
2017-11-09 00:41:59 +11:00 |
|