Bjarke Berg
|
39162f0f6a
|
Merge conflicts resolved
|
2020-08-06 12:59:21 +02:00 |
|
Bjarke Berg
|
3c622905ba
|
Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
# src/Umbraco.Infrastructure/Models/Mapping/ContentTypeMapDefinition.cs
# src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
|
2020-05-11 08:23:59 +02:00 |
|
Bjarke Berg
|
683c0b8732
|
Merge branch 'netcore/dev' into netcore/feature/move-mappings-after-httpcontext
|
2020-02-24 08:24:19 +01:00 |
|
Bjarke Berg
|
90c2381c86
|
Renamed Umbraco.Abstractions to Umbraco.Core
|
2020-02-24 08:21:53 +01:00 |
|
Shannon
|
3bd223669f
|
Moves as much as possible from Models/Packaging, Models/PublishedContent, Models/Entities, Models/Membership
|
2019-11-14 16:19:24 +11:00 |
|
Bjarke Berg
|
10fd0bd013
|
Post merge stuff
|
2019-10-30 15:28:15 +01:00 |
|
Bjarke Berg
|
eade92e803
|
Merge remote-tracking branch 'origin/v8/dev' into vx/feature/unicore
# Conflicts:
# src/Umbraco.Core/ObjectExtensions.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/ContentTypeRepositoryBase.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Web.UI.Client/package-lock.json
|
2019-10-30 13:35:48 +01:00 |
|
Dave Woestenborghs
|
88f153e7a3
|
V8 - Make it possible to set content app badge through content… (#6706)
|
2019-10-23 17:31:18 +02:00 |
|
Bjarke Berg
|
408b00a737
|
Moved more abstractions of models
|
2019-05-27 11:20:33 +02:00 |
|
Stephan
|
1eee6dfb2f
|
Cleanup
|
2018-12-07 14:05:47 +01:00 |
|
Bjarke Berg
|
aee6156a09
|
Refactored the ManifestContentAppDefinition to have a factory and a seperate data class.
|
2018-12-06 10:02:23 +01:00 |
|
Shannon
|
162b90194d
|
Gets sln building, removes old legacy settings, removes ascx dashboard support
|
2018-12-03 16:14:49 +11:00 |
|
Carole Rennie Logan
|
1f072a383e
|
ContentApp Show/Hide per user Role
Making content app work show hide in manifest work for user roles. for example:
"show": [
"+role/admin"
]
|
2018-10-14 15:56:22 +01:00 |
|
Stephan
|
681ef67653
|
Support ordering content apps
|
2018-09-21 09:42:36 +02:00 |
|
Stephan
|
d6775aa79a
|
Implement content apps code config and manifest
|
2018-09-21 08:09:53 +02:00 |
|