yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,765 Commits 4 Branches 7 Tags
3ebf8a969c4245a4b815a3cf75248d066f418d97
Commit Graph

10491 Commits

Author SHA1 Message Date
Bjarke Berg
9e6ed6fb6f Merge pull request #8094 from umbraco/netcore/feature/mvc-application-model 
Don't modify global MVC options (and more)
 2020-05-12 07:38:19 +02:00
Shannon
4107ccdb12 cleanup unneeded code , adds notes 2020-05-12 14:20:43 +10:00
Shannon
39fed867c1 Cleans up some routing, mvc base classes, gets controller specific model binding working, applies our own application model to our controllers 2020-05-12 10:21:40 +10:00
Bjarke Berg
be81e927a9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-05-11 12:31:47 +02:00
Bjarke Berg
f8c4ac6623 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-05-11 12:24:45 +02:00
Niels Lyngsø
945f4db4c3 8087 forEach utility method (#8088) 2020-05-11 12:04:07 +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
Shannon
aa25e29e7b removes old machine key things 2020-05-08 17:53:24 +10:00
Bjarke Berg
269c75e26b AB¤6233 - Reverted changes to typefinder and implemented check for if SqlCE is available in the install process 2020-05-06 20:37:03 +02:00
Bjarne Fyrstenborg
88c842ccda Add utility function equivalent to angular.fromJson (#8014) 2020-05-06 16:41:00 +02:00
Warren Buckley
fff23095a6 Merge pull request #5677 from umbraco/v8/feature/5656-ux-doctype-property-creation-journey 
New user journey for the DataType Picker in the DocumentType Editor
 2020-05-06 15:03:07 +01:00
Niels Lyngsø
ff54543adf align button style for languages 2020-05-06 15:58:39 +02:00
Niels Lyngsø
0d412598dd add control-group to message for proper spacing 2020-05-06 15:24:14 +02:00
Niels Lyngsø
9e9270cc70 added missing slash 2020-05-06 15:19:45 +02:00
Niels Lyngsø
45ba811a96 simplified umbCmsTitleCase 2020-05-06 15:11:16 +02:00
Niels Lyngsø
addb21b832 Update src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less 
Co-authored-by: Warren Buckley <warren@umbraco.com>
 2020-05-06 15:02:20 +02:00
Niels Lyngsø
46a91f62a5 Update src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less 
Co-authored-by: Warren Buckley <warren@umbraco.com>
 2020-05-06 15:02:00 +02:00
Niels Lyngsø
d8f7c863e7 revert margin-left 2020-05-06 11:05:04 +02:00
Niels Lyngsø
7737a37562 use right wording when segment now is around 2020-05-06 11:00:45 +02:00
Niels Lyngsø
d621bc5d13 turn <a> into <button> 2020-05-06 10:51:02 +02:00
Niels Lyngsø
7a1489923d Merge remote-tracking branch 'origin/v8/dev' into v8/feature/5656-ux-doctype-property-creation-journey 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/variables.less
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/propertysettings/propertysettings.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2020-05-06 09:45:47 +02:00
Niels Lyngsø
1320191a8a remove console.error 2020-05-05 15:01:44 +02:00
Bjarke Berg
13197eb5ff AB#6233 - Cleanup / Fixes from review 2020-05-05 14:28:01 +02:00
Niels Lyngsø
d761658feb remove console.log 2020-05-05 14:20:33 +02:00
Niels Lyngsø
eec400021c make sure that validation indication in variant-picker only stays as long as a error is present. Plus avoid displaying field-errors, we only want to use property errors for this indication. 2020-05-05 13:09:24 +02:00
Bjarke Berg
305ed42b48 Moved the sqlce db to root/App_Data/umbraco.sdf, instead of wwwroot/App_Data/umbraco.sdf 2020-05-04 14:40:11 +02:00
Bjarke Berg
03c68fa638 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB6233-install-steps-in-dotnet-core 2020-05-04 06:55:08 +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
Bjarke Berg
b70d7101e3 AB#6233 - Explicit restarts umbraco after install to ensure runtime state is run and umbraco is correct composed. 2020-05-01 13:40:26 +02:00
Niels Lyngsø
3e65d21b67 always have the empty fallback function 2020-05-01 13:18:08 +02:00
Niels Lyngsø
ef56d9cbe3 revert change title 2020-05-01 12:50:55 +02:00
Niels Lyngsø
138f38d786 added some description to bindings 2020-05-01 11:57:06 +02:00
Niels Lyngsø
c060cd3b8d rename variantNodeModel to contentNodeModel 2020-05-01 11:55:49 +02:00
Niels Lyngsø
0ef7bddce9 if varaints, only show URLs that are equal to the current viewing culture 2020-05-01 11:16:27 +02:00
Niels Lyngsø
b992830307 correct spelling mistake 2020-05-01 10:25:08 +02:00
Niels Lyngsø
871e50efb8 variant validation error test 2020-05-01 09:56:09 +02:00
Niels Lyngsø
2b5f3eeedd correcting test to parse segment attribute 2020-05-01 09:41:31 +02:00
Bjarke Berg
da1e83c0d1 AB#6233 - Added application url on IHostingEnvironment. Still need a way to figure out how to get this value 2020-05-01 08:26:05 +02:00
Niels Lyngsø
0bb656482b should use _ to align with server feedback in modelState 2020-04-30 08:26:42 +02:00
Niels Lyngsø
87a22bd427 pick tabs from variant content, not the node content model. 2020-04-29 16:28:39 +02:00
Niels Lyngsø
01c81023a8 parse allowSegmentVariant on 2020-04-29 16:05:39 +02:00
Niels Lyngsø
50ef099173 remove console.log 2020-04-29 15:16:59 +02:00
Niels Lyngsø
329b9fe04e Have compositId and htmlId available always for content 2020-04-29 15:16:39 +02:00
Niels Lyngsø
97f7ff519b ups, removes , 2020-04-29 14:57:43 +02:00
Niels Lyngsø
42f9466b1d replace angular.forEach with native forEach 2020-04-29 14:57:15 +02:00
Niels Lyngsø
03fc9cae3c use Utilities for copy 2020-04-29 14:50:53 +02:00
Niels Lyngsø
ea2f8fe71f fixes sort of variants problem 2020-04-29 14:21:44 +02:00
Niels Lyngsø
7f42974bc2 reworked ensuring activeApp 2020-04-28 11:59:34 +02:00
Niels Lyngsø
a8bcf2864f avoid breaking change of serverValidationManager.hasPropertyError() 2020-04-28 11:10:45 +02:00
Niels Lyngsø
370981e214 avoid breaking change of serverValidationManager.getPropertyError() 2020-04-28 11:09:46 +02:00