Commit Graph

1418 Commits

Author SHA1 Message Date
Stephan
58e4e2398a Variant names, availability, etc 2018-04-17 19:08:53 +02:00
Stephan
dc589f9b96 Fix csproj, nuspec 2018-04-16 16:08:26 +02: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
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
f7a14a03f2 Fix build, still some weird csc.exe versionning 2018-04-04 17:41:55 +02: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
cdd064ba08 Upgrade Dependencies 2018-04-03 14:54:01 +02:00
Stephan
c75d4e5b5b Fix post-merge 2018-03-30 11:00:07 +02:00
Stephan
62b6efc4da Fix upgrading 2018-03-30 10:28:49 +02: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
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
Stephan
0a4878d2a3 Port v7@2aa0dfb2c5 - WIP 2018-03-27 10:04:07 +02:00
Stephan
a2a4edb3be Port v7@2aa0dfb2c5 - WIP 2018-03-22 17:41:13 +01:00
Shannon
01b48a5aab adds logic for repository and unit tests 2018-03-22 23:15:52 +11:00
Stephan
62c5f0f1ef Port v7@2aa0dfb2c5 - WIP 2018-03-22 11:25:38 +01:00
Stephan
8bfb8e2b72 Port v7@2aa0dfb2c5 - WIP 2018-03-22 11:25:33 +01:00
Stephan
41948607d0 Port v7@2aa0dfb2c5 - WIP 2018-03-22 11:25:25 +01:00
Stephan
a9147f1473 Port v7@2aa0dfb2c5 - WIP 2018-03-22 11:25:22 +01:00
Shannon
b46add81f0 Merge branch 'dev-v7.10' into temp-u4-10756 2018-03-21 11:39:28 +11:00
Stephan
39cc7add80 Rename Umbraco.Whatever2 editors 2018-03-19 18:39:34 +01:00
Stephan
dda696bde5 Troubleshoot, fix 2018-03-16 09:11:59 +01:00
Stephan
6bc68005f4 U4-10756 - id/guid cache, new version 2018-03-15 09:46:39 +01:00
Stephan
0277ddc584 DataType troubleshooting 2018-03-05 14:59:23 +01:00
Stephan
030c97ef26 Super user is not a Zero 2018-03-02 16:00:15 +01:00
Claus
13c675d718 updating route to use the old url.
removing leftover index.html.
adding migration for renaming preview folder on disk.
2018-02-28 12:04:39 +01:00
Shannon
fd5bc49c87 Audits the member being exported, moves the export method to the service (again) but returns a proper model this time and raises an event, adds error checking to the export http request 2018-02-27 00:40:43 +11:00
Stephan
1f60314348 Refactor editing, cleanup 2018-02-25 10:43:16 +01:00
Stephan
47d7677948 Refactor editing, all tests green 2018-02-16 12:00:45 +01:00
Stephan
cfd2ba3b5a Refactor editing 2018-02-15 14:53:29 +01:00
Shannon
9f4875c8a7 removes SaveUserGroupWithUsersEventArgs and replaces with SaveEventArgs<UserGroupWithUsers> and changes the SavedUserGroupWithUsers to SavingUserGroup2 and SavedUserGroup2 2018-02-14 11:13:24 +11:00
Stephan
5eb22b0fd9 report added/removed users from groups 2018-02-13 15:30:58 +01:00
Stephan
29690df567 U4-10795 - misc fixes 2018-02-09 09:33:24 +01:00
Stephan
c0439b3c4e DataTypes refactoring - troubleshooting 2018-02-08 16:08:52 +01:00
Stephan
7c34255abe Merge branch origin/dev-v7.9 into temp-u4-10795 2018-02-07 15:55:41 +01:00
Stephan
450854a209 DataType refactoring - polish 2018-02-07 13:35:59 +01:00
Stephan
02397fd90c U4-10795 - granular logging 2018-02-06 19:07:54 +01:00
Stephan
a97900515b DataType refactoring - polish 2018-02-05 17:48:54 +01:00
Stephan
947d08c947 DataType refactoring - troubleshooting 2018-02-02 19:50:48 +01:00
Stephan
b416079e12 DataType refactoring - troubleshooting tags and fixing tests 2018-02-01 14:14:45 +01:00
Sebastiaan Jansssen
647492fbfb Merge branch 'dev-v7.9' into temp-u4-10794 2018-02-01 12:55:53 +01:00
Stephan
971d7cf933 U4-10794 - refactor 2018-01-31 15:20:03 +01:00
Sebastiaan Jansssen
1f6dea7177 Adds migration to create constent table 2018-01-31 12:47:41 +01:00
Stephan
f5546ca870 DataType refactoring - troubleshooting and fixing tests 2018-01-29 19:23:25 +01:00
Shannon
995f644501 Adds upgrade logic, fixes tests, fixes model mappings to not do so much AfterMap 2018-01-26 17:27:35 -07:00
Stephan
e60a5a4a83 DataType refactoring - in progress 2018-01-26 17:55:20 +01:00
Stephan
a16ac1f0ba U4-10794 - implement basic consent service 2018-01-26 10:57:12 +01:00