yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,049 Commits 4 Branches 7 Tags
40f94d23d4e0c28fa114b0cd3950b1198b80cb5e
Commit Graph

1651 Commits

Author SHA1 Message Date
Stephan
40f94d23d4 Cleanup 2018-04-25 17:39:02 +02:00
Stephan
f3bf5d86d2 Cleanup BTree 2018-04-25 17:39:02 +02:00
Shannon
d552d5dadb Updates UI and mapping to update a property type to allow being culture variant 2018-04-24 15:27:33 +10:00
Shannon
9044c9328d Gets inbound routing working, reduces the amount of non injected dependencies, reduces the amount of DomainHelper instances 2018-04-24 13:07:18 +10:00
Shannon
48641166b9 WIP - gets 'inbound' routing working to generate culture specific URLs 2018-04-24 01:31:01 +10:00
Shannon
c84087e96b Gets the variant names working in the editor 2018-04-20 00:59:23 +10:00
Shannon
d4252a3dc8 Merge branch 'dev-v8' into temp8-U4-11219 2018-04-20 00:12:31 +10:00
Shannon
04da7cfd20 doh, fixes csproj merge 2018-04-20 00:09:12 +10:00
Shannon
e9e0274ad8 fixes MultipleContentPickerParameterEditor 2018-04-20 00:03:19 +10:00
Shannon
966de9b9f4 Merge branch 'dev-v8' into temp8-U4-11219 2018-04-19 23:49:06 +10:00
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
Shannon
8ae27ecc27 Updates doc type editor to be able to change update the doc type to support being culture variant 2018-04-19 22:06:02 +10:00
Shannon
2872d0b0a2 Fixes tree init logic when user isn't logged in, moves sequential promise chaining to a helper funciton, updates the route promise chaining to actual chain. 2018-04-17 14:43:17 +10:00
Shannon
319bd783ff Merge remote-tracking branch 'origin/dev-v8' into temp-U4-11177 2018-04-17 01:45:32 +10:00
Stephan
6b3c6eba8d Fix csproj, nuspec 2018-04-16 17:04:23 +02:00
Stephan
dc589f9b96 Fix csproj, nuspec 2018-04-16 16:08:26 +02:00
Shannon
a92361bd00 Tree refactor, cleanup legacy support, remove odd jquery callback object, removes unused files, removes publish dialog 2018-04-16 23:07:00 +10:00
Sebastiaan Janssen
29d9dcffb8 Manually applying PR: Three new healthchecks #1522 2018-04-12 18:38:00 +02:00
Sebastiaan Janssen
30f8885aa9 Merge branch 'u4-9983' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9983 
# Conflicts:
#	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/zh.xml
#	src/Umbraco.Web/HealthCheck/Checks/Security/ClickJackingCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs
 2018-04-12 17:59:11 +02:00
Shannon
fddea8c815 Fixes data type pre-value issues with MNTP, removes unecessary contentpicker.html and memberpicker.html overlays since treepicker.html is all that should be used, cleans up the treepicker one to be more inline with our current angular standards. Removes uneeded event handling from treepicker 2018-04-12 21:29:36 +10:00
Warren
d8459bf4b4 Changes to build script & references etc with Stephan 2018-04-11 18:06:33 +02:00
Shannon
59f9af6eb8 Gets publish dialog mostly working with server side validation messages wired up to the dialog 2018-04-10 01:38:35 +10:00
Shannon
e10698532b Merge branch 'dev-v8' into temp-U4-11127 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
 2018-04-06 13:56:07 +10:00
Shannon
c90d6be8ab U4-8861 Extract GlobalSettings to an interface and expose on the standard UmbracoConfig.For settings singleton including a bunch of cleanup, getting the installer and steps to be DI 2018-04-06 13:51:54 +10:00
Shannon
990ca51279 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 2018-04-05 23:11:24 +10:00
Shannon
262c4afb16 Removes FormsAuthentication cookie format and replaces with standard aspnet identity format, removes a bunch of old obsolete and unused code, fixes the culture setting issue, simplifies the UmbracoBackOfficeIdentity since it no longer needs to be a FormsIdentity and just a straight forward ClaimsIdentity 2018-04-05 23:10:51 +10:00
Stephan
eb6a08af31 v7@11d4189c8d 2018-04-05 14:12:15 +02:00
Stephan
f7a14a03f2 Fix build, still some weird csc.exe versionning 2018-04-04 17:41:55 +02:00
Shannon
d618151e4f Fixes the csproj, binding redirects and versions 2018-04-04 15:54:39 +10:00
Shannon
cdd50b899a Merge remote-tracking branch 'origin/dev-v8' into temp-U4-11127 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2018-04-04 15:04:11 +10:00
Shannon
7a73175aa0 Starts wiring up the back office to the c# bits, updates controllers, mappers, models, property editors to support getting and saving data by language. The content editor now "works" with multi-lingual properties 2018-04-04 01:59:51 +10:00
Stephan
75966dcfbd Merge branch origin/dev-v8 into dev-v8 2018-04-03 14:57:55 +02:00
Stephan
cdd064ba08 Upgrade Dependencies 2018-04-03 14:54:01 +02:00
Shannon
e7bc4986a5 Start updating the model/controller for editing variants in the back office and wiring up the angular side of things 2018-04-03 19:25:43 +10:00
Shannon
1719d33a48 Fixes tests, updates examine, fixes how __Path is stored 2018-04-03 12:33:21 +10:00
Stephan
62b6efc4da Fix upgrading 2018-03-30 10:28:49 +02:00
Shannon
7f27862943 Gets correct validation working with languages, we can now create and update 2018-03-30 01:20:40 +11:00
Shannon
b9d0c63002 Starts wiring up the language editor with the controller, ensure that you cannot delete a language at the repo level and makes sure that we return and show validation messages when the user tries to delete the default or last language. 2018-03-29 23:48:54 +11:00
Shannon
7fd9caf889 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 
# Conflicts:
#	src/Umbraco.Web/PublishedContentQuery.cs
 2018-03-29 22:35:46 +11:00
Shannon
8f01a2ab0a fixes merge issues 2018-03-29 22:13:41 +11: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
Shannon
10dec4115d Updates to latest examine and replaces IExamineIndexCollectionAccessor since we now have IExamineManager 2018-03-29 16:42:11 +11:00
Shannon
5482b8f2f0 Merge remote-tracking branch 'origin/dev-v8' into temp-U4-11102 
# Conflicts:
#	src/NuGet.Config
#	src/Umbraco.Web/Components/DatabaseServerRegistrarAndMessengerComponent.cs
#	src/Umbraco.Web/IPublishedContentQuery.cs
#	src/Umbraco.Web/PublishedContentQuery.cs
#	src/Umbraco.Web/Search/ExamineComponent.cs
#	src/Umbraco.Web/WebServices/ExamineManagementApiController.cs
 2018-03-29 14:00:20 +11:00
Shannon
7d13704cf9 Updates to latest examine beta, cleans up more code, always reference a searcher by it's indexer 2018-03-28 22:23:17 +11:00
Stephan
14592a227b Merge origin/dev-v8 into v7 temp merge 2018-03-28 12:58:39 +02:00
Stephan
0ecc333a90 Fix port, tests 2018-03-28 11:28:32 +02:00
Shannon
52aa02668f Gets examine working with proper events, tests are working, etc... 2018-03-28 16:12:43 +11:00
Shannon
c2707f3806 updates to latest examine and fixes a test 2018-03-28 12:46:34 +11:00
Stephan
c2e1ba21b2 Port v7@2aa0dfb2c5 - WIP 2018-03-27 16:18:51 +02:00
Stephan
d40a835701 Port v7@2aa0dfb2c5 - WIP 2018-03-27 10:51:41 +02:00