Shannon
|
b96ba05d22
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1
# build/NuSpecs/UmbracoCms.Core.nuspec
# build/NuSpecs/UmbracoCms.nuspec
# build/NuSpecs/tools/Readme.txt
# src/Umbraco.Core/Configuration/UmbracoConfig.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
# src/Umbraco.Core/Constants-Conventions.cs
# src/Umbraco.Core/Constants-System.cs
# src/Umbraco.Core/IO/MediaFileSystem.cs
# src/Umbraco.Core/Media/Exif/ImageFile.cs
# src/Umbraco.Core/Models/Property.cs
# src/Umbraco.Core/Models/PropertyTagBehavior.cs
# src/Umbraco.Core/Models/PropertyTags.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/SetDefaultTagsStorageType.cs
# src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
# src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
# src/Umbraco.Core/Security/AuthenticationExtensions.cs
# src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
# src/Umbraco.Core/Services/Implement/PackagingService.cs
# src/Umbraco.Core/Services/ServerRegistrationService.cs
# src/Umbraco.Core/StringExtensions.cs
# src/Umbraco.Core/packages.config
# src/Umbraco.Tests/ApplicationUrlHelperTests.cs
# src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
# src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
# src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
# src/Umbraco.Tests/packages.config
# src/Umbraco.Web.UI.Client/package.json
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
# src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js
# src/Umbraco.Web.UI.Client/src/common/services/user.service.js
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/components/card.less
# src/Umbraco.Web.UI.Client/src/less/navs.less
# src/Umbraco.Web.UI.Client/src/less/panel.less
# src/Umbraco.Web.UI.Client/src/less/property-editors.less
# src/Umbraco.Web.UI.Client/src/less/tree.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
# src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
# src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
# src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/packages.config
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Editors/BackOfficeController.cs
# src/Umbraco.Web/Editors/CanvasDesignerController.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/DashboardController.cs
# src/Umbraco.Web/Editors/LogController.cs
# src/Umbraco.Web/Editors/MediaController.cs
# src/Umbraco.Web/Install/InstallHelper.cs
# src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
# src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
# src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs
# src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
# src/Umbraco.Web/Mvc/MasterControllerFactory.cs
# src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
# src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
# src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs
# src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
# src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
# src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
# src/Umbraco.Web/Scheduling/KeepAlive.cs
# src/Umbraco.Web/Scheduling/LogScrubber.cs
# src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
# src/Umbraco.Web/Scheduling/ScheduledTasks.cs
# src/Umbraco.Web/Scheduling/Scheduler.cs
# src/Umbraco.Web/Templates/TemplateUtilities.cs
# src/Umbraco.Web/Trees/DataTypeTreeController.cs
# src/Umbraco.Web/UmbracoModule.cs
# src/Umbraco.Web/_Legacy/Packager/Installer.cs
# src/Umbraco.Web/packages.config
# src/Umbraco.Web/umbraco.presentation/keepAliveService.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
# src/umbraco.businesslogic/IO/IOHelper.cs
# src/umbraco.cms/packages.config
# src/umbraco.cms/umbraco.cms.csproj
# src/umbraco.controls/packages.config
# src/umbraco.controls/umbraco.controls.csproj
# src/umbraco.editorControls/packages.config
# src/umbraco.editorControls/umbraco.editorControls.csproj
|
2018-10-01 14:32:46 +02:00 |
|
Stephan
|
bbd8315176
|
Merge remote-tracking branch 'origin/temp8' into temp8-nuget-pkgs
|
2018-09-06 13:57:34 +02:00 |
|
Stephan
|
612c38654d
|
Merge branch origin/dev-v7 into temp8
|
2018-09-06 13:07:09 +02:00 |
|
Shannon
|
f359648215
|
fixes U4-11463 MembershipHelper is not working with basic auth on the initial request
|
2018-08-30 09:57:16 +02:00 |
|
Shannon
|
029eff1f8a
|
Some refactoring to decouple web based assemblies from Umbraco.Core and move whatever we can to Umbraco.Web where web based assemblies are used. Decouples System.Drawing entirely from Umbraco.Core and removes the Active Directory dependency from Umbraco.core.
|
2018-08-29 01:15:46 +10:00 |
|
Warren
|
9e996c68bb
|
Refactored the error params, so that exception is before the message/template so its more in sync with Serilog signature & was an easy way to find some more logs I missed too
|
2018-08-17 15:41:58 +01:00 |
|
Warren
|
23ed9773bc
|
FIRST PASS - Updates Umbraco.Web project to not use the func overload & to use new message template instead
|
2018-08-14 22:36:47 +01:00 |
|
Anthony
|
40f04f7510
|
Fixed unintended whitespace
|
2018-07-02 10:47:43 +01:00 |
|
Anthony
|
7affbbd186
|
Removed obsolete methods from Umbraco.Web which are not used.
|
2018-07-01 18:06:00 +01:00 |
|
Stephan
|
7a615133ff
|
Renormalize
|
2018-06-29 19:52:40 +02:00 |
|
Stephan
|
6a05c556b5
|
Merge pull request #2751 from lkoruba/hackathon-use-logger-warn-with-func
(V8 Hackathon) use logger warn with func<string>
|
2018-06-29 16:43:22 +02:00 |
|
lkoruba
|
b515f24c16
|
Change calls to logger.Warn method to use Func<string> second part
|
2018-06-29 15:35:56 +02:00 |
|
Dawid Koruba
|
7660e10098
|
Change calls to logger.Info method to use Func<string> parameter
|
2018-06-29 14:25:17 +02:00 |
|
Shannon
|
437855979d
|
Fixes passing in the user id for copy operations
|
2018-05-31 23:33:52 +10:00 |
|
Stephan
|
3495331005
|
Cleanup, get rid of warnings
|
2018-05-03 15:11:57 +02:00 |
|
Shannon
|
73567ffdce
|
Fixes IPublishedShapshot and friends
|
2018-04-27 11:38:50 +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
|
7442c96be1
|
removes unused methods
|
2018-04-05 23:15:51 +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 |
|
Shannon
|
798236dc85
|
removes unused code, cleans up web.confgi
|
2018-04-05 18:13:50 +10:00 |
|
Stephan
|
796d931f65
|
Fix tests & apps
|
2018-03-28 18:07:53 +02:00 |
|
Stephan
|
d40a835701
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-27 10:51:41 +02:00 |
|
Stephan
|
030c97ef26
|
Super user is not a Zero
|
2018-03-02 16:00:15 +01:00 |
|
Sebastiaan Jansssen
|
b76b09026b
|
Merge branch 'dev-v7' into dev-v7.8
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI.Client/src/assets/img/installer.jpg
# src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
# src/Umbraco.Web.UI.Client/src/controllers/search.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.controller.js
# src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
# src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
# src/Umbraco.Web/Editors/TourController.cs
# src/Umbraco.Web/Models/BackOfficeTour.cs
# src/Umbraco.Web/Models/BackOfficeTourStep.cs
# src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
# src/Umbraco.Web/TourFilterResolver.cs
# src/Umbraco.Web/Trees/MacroTreeController.cs
# src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
# src/umbraco.cms/businesslogic/Packager/Installer.cs
# src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs
|
2018-01-31 17:02:03 +01:00 |
|
Stephan
|
d23933a5b1
|
DataType refactoring preparation - Entity refactoring
|
2018-01-15 13:28:35 +01:00 |
|
Robert
|
bba58ea0c0
|
Replaced all usages of DisposableObject with DisposableObjectSlim
|
2018-01-10 13:48:55 +01:00 |
|
Shannon Deminick
|
43f369f96f
|
Merge pull request #2306 from Sam7/dev-v7
U4-10453 - Ability to Sync after each external login (using OWIN)
|
2017-12-18 14:42:25 +11:00 |
|
Shannon
|
78f6b8d8bc
|
Fixes up more the the session id validation, makes sure that the GetUserSecondsMiddleWare also validates the session since this is what keeps the user logged in if that option is being used.
|
2017-11-08 23:57:17 +11:00 |
|
Stephan
|
09f499d5d6
|
More content refactoring (WIP, barely builds)
|
2017-11-08 08:39:36 +01:00 |
|
Sam Sperling
|
dcdaa8d62d
|
U4-10453 - Ability to Sync after each external login (using OWIN)
Added a new function OnExternalLogin for the ExternalSignInAutoLinkOptions to enable full syncing capabilities for external logins
|
2017-11-06 15:31:36 +11:00 |
|
Shannon
|
019147c1a1
|
Moves the session generation to the BackOfficeCookieAuthenticationProvider which is where it should be, so it only gets generated before the cookie is written. Writes the checking cookie inside of a lock to prevent multiple db and cookie writes that are unecessary.
|
2017-11-03 18:07:17 +11:00 |
|
Shannon
|
782d6100f0
|
Gets user session management tracking via the database including detecting stale sessions, generating and removing them along with cleaning them up. This takes into account legacy code too. The session is revalidated on a one minute threshold per user so that it's not hammering the databse on every request.
|
2017-11-03 17:27:23 +11:00 |
|
Stephan
|
829d995154
|
Simplicity
|
2017-10-31 12:50:30 +01:00 |
|
Stephan
|
ec6ba01cbf
|
So long Facade
|
2017-10-31 12:48:24 +01:00 |
|
Stephan
|
5ba2ffcbf3
|
CrLfTab
|
2017-09-23 10:08:18 +02:00 |
|
Stephan
|
dca3b74542
|
Refactor and fix tests
|
2017-09-20 20:06:46 +02:00 |
|
Stephan
|
8721478fd3
|
Port 7.7 - WIP
|
2017-09-19 17:14:12 +02:00 |
|
Stephan
|
ca0d5e365a
|
Port 7.7 - WIP
|
2017-09-19 16:46:49 +02:00 |
|
Stephan
|
9ed6576908
|
Port 7.7 - WIP
|
2017-09-19 15:51:47 +02:00 |
|
Shannon
|
029ace796d
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# src/Umbraco.Core/Security/BackOfficeUserManager.cs
# src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
|
2017-09-18 20:04:05 +10:00 |
|
Shannon
|
8b39f495e5
|
Simplifies the UnlockUser method so we don't have to have it in the BackOfficeUserManager
|
2017-09-18 19:59:23 +10:00 |
|
Shannon
|
e8e0664129
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7, removes the UnlockUser method of BackOfficeUserManager since the membership provider is no longer used to perform any unlocking
|
2017-09-18 19:38:10 +10:00 |
|
Shannon
|
d468e346f1
|
reverts changes made to UmbracoMembershipProvider and adds another virtual internal method that the UsersMembershipProvider overrides, so now all of the event raising is done in the user specific provider.
|
2017-09-18 19:01:00 +10:00 |
|
Shannon
|
2a10eed059
|
Moves raising events for reseting/changing password out of the MembershipHelper ChangePassword method and to the places where it is being called
|
2017-09-18 16:56:43 +10:00 |
|
Sebastiaan Janssen
|
bb88eb155f
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# src/Umbraco.Core/Security/BackOfficeSignInManager.cs
# src/Umbraco.Core/Security/BackOfficeUserManager.cs
# src/Umbraco.Web/Editors/AuthenticationController.cs
# src/Umbraco.Web/Security/MembershipHelper.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
|
2017-09-15 16:34:51 +02:00 |
|
Sebastiaan Janssen
|
b6dbc245e2
|
Merge branch 'dev-v7' into temp-U4-8634
|
2017-09-15 13:57:46 +02:00 |
|
Stephan
|
4634eb28e7
|
Port 7.7 - WIP
|
2017-09-14 11:41:46 +02:00 |
|
Stephan
|
37171d96bc
|
Port 7.7 - WIP
|
2017-09-13 17:35:20 +02:00 |
|
Stephan
|
96c08f24ee
|
Port 7.7 - WIP
|
2017-09-12 16:22:16 +02:00 |
|
Shannon Deminick
|
85758011b5
|
Merge pull request #2140 from umbraco/temp-U4-10268_2
U4-10268 7.7 Beta - Changing password should be safe by default
|
2017-09-07 22:38:45 +10:00 |
|