Warren Buckley
|
54a2aa00a7
|
Revert "Temp8 tinymce"
|
2018-11-22 14:05:51 +00:00 |
|
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 |
|
agrath
|
63a2a155d1
|
User invite flow review (#3000)
|
2018-09-30 15:03:52 +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
|
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 |
|
Stephan
|
7a615133ff
|
Renormalize
|
2018-06-29 19:52:40 +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
|
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 |
|
Stephan
|
553de2ea68
|
Cleanup ILogger
|
2018-04-03 16:15:59 +02:00 |
|
Stephan
|
0a4878d2a3
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-27 10:04:07 +02:00 |
|
Stephan
|
030c97ef26
|
Super user is not a Zero
|
2018-03-02 16:00:15 +01: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
|
5ba2ffcbf3
|
CrLfTab
|
2017-09-23 10:08:18 +02:00 |
|
Stephan
|
ca0d5e365a
|
Port 7.7 - WIP
|
2017-09-19 16:46:49 +02:00 |
|
Shannon
|
6205d8a9f9
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# src/Umbraco.Web/Editors/AuthenticationController.cs
|
2017-09-19 13:34:08 +10:00 |
|
Shannon
|
0ef57d819c
|
removes uneeded null checks from AuthenticationController for raising UserManager events
|
2017-09-19 13:31: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
|
388d660e11
|
Raise event when login succeeds after 2FA challenge. Raise event when locked out during 2FA attempts.
|
2017-09-15 15:12:40 +02:00 |
|
Stephan
|
4634eb28e7
|
Port 7.7 - WIP
|
2017-09-14 11:41:46 +02:00 |
|
Stephan
|
96c08f24ee
|
Port 7.7 - WIP
|
2017-09-12 16:22:16 +02:00 |
|
Stephan
|
ab8fc33691
|
Port 7.7 - WIP
|
2017-08-14 18:21:48 +02:00 |
|
Stephan
|
e52adfdd07
|
Merge branch user-group-permissions into temp-U4-8643
|
2017-07-28 10:38:43 +02:00 |
|
Shannon
|
0ffd02fc61
|
Merge branch 'temp-U4-10175' into temp-U4-10138
|
2017-07-28 14:02:16 +10:00 |
|
Shannon
|
d232aa1f00
|
U4-10175 User avatar should refresh in top left corner when it's changed
|
2017-07-25 20:51:58 +10:00 |
|
Shannon
|
7aca656919
|
Merge branch 'user-group-permissions' into temp-U4-10138
# Conflicts:
# src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
# src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
|
2017-07-20 20:00:05 +10:00 |
|
Stephan
|
c76403077f
|
Normalize cr/lf/tab
|
2017-07-20 11:21:28 +02:00 |
|
Shannon
|
63befa55d5
|
Updates password changing for users to use ASP.NET Identity, there's still some more work here to do to implement the IUserAwarePasswordHashing and to result some of the TODOs. Also moved all password changing logic to PasswordChanger even for legacy membership providers.
|
2017-07-20 12:53:09 +10:00 |
|
Shannon
|
8df00d5525
|
Fixes U4-10111 Changing email on a user doesn't show the username field
|
2017-07-19 19:22:43 +10:00 |
|
Shannon
|
b32325bbaa
|
Adds all change tracking to the BackOfficeIdentityUser ensures values are not persisted that are not changed, adds required null checks, removes internal method GetOrCreateBackOfficeUser
|
2017-07-19 14:13:42 +10:00 |
|
Shannon
|
73b107ee2a
|
Fixing U4-10138 Cannot upgrade to 7.7 due to user groups and U4-7907 With non OAuth external login providers we should have an 'auto-link' / 'auto-create' callback option
|
2017-07-18 19:53:34 +10:00 |
|
Shannon
|
d78dcb51c0
|
Gets the invite fully working along with choosing an avatar, adds more security so that the link can't be used again,
|
2017-06-27 19:55:03 +10:00 |
|
Shannon
|
021e083b75
|
Fixes issue with email confirmation date, adds invite date, adds user state counts
|
2017-06-15 16:47:51 +02:00 |
|
Shannon
|
f33d21b8f6
|
Gets all the localization for the invite setup and error checking based on the password provider information
|
2017-06-15 12:45:53 +02:00 |
|
Shannon
|
6d22f7f86f
|
Getting the invite password setting done with validation, almost there
|
2017-06-15 00:05:12 +02:00 |
|
Shannon
|
a62426a763
|
Gets email sending ensures user is logged in with verifying but is only partially logged in and cannot access the back office, they can only access the verification screen
|
2017-06-14 16:21:56 +02:00 |
|
Shannon
|
e757868d09
|
Moves logic back to user service for inviting a user since its much simpler.
|
2017-06-13 18:47:20 +02:00 |
|
Shannon
|
f09f17e496
|
getting email invite working and with identity apis
|
2017-06-13 18:38:16 +02:00 |
|
Sebastiaan Janssen
|
547767fc0f
|
Fixes: when valid username is used, don't raise the unknown username event
|
2017-06-05 17:16:22 +02:00 |
|
Sebastiaan Janssen
|
74126134b1
|
Some more cleanup
|
2017-06-05 12:07:45 +02:00 |
|
Sebastiaan Janssen
|
114b58c5ca
|
Raise events for failed login attempts for unknown users
|
2017-06-05 10:43:57 +02:00 |
|
Shannon
|
121036ebb9
|
Merge branch 'dev-v7.7' into user-group-permissions
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Umbraco.Web.csproj
|
2017-06-05 10:35:23 +02:00 |
|
Sebastiaan Janssen
|
3019d67922
|
Adds forgot password events
|
2017-06-05 10:25:05 +02:00 |
|
Sebastiaan Janssen
|
aebea2da31
|
Merge remote-tracking branch 'origin/dev-v7' into temp-U4-8634
|
2017-06-04 14:35:35 +02:00 |
|
Stephan
|
7ea9c9c8e2
|
Move Web.Current to Composing
|
2017-05-30 18:13:11 +02:00 |
|
Stephan
|
d34a425dd1
|
porting 7.6@5c5baca into 8
|
2017-05-30 12:54:22 +02:00 |
|
Shannon
|
6cd52bbc3c
|
Gets user invite generating the token, sending the email and then verifying the token
|
2017-05-29 15:55:36 +02:00 |
|
Stephan
|
8561d85f7a
|
porting 7.6-rc1 into 8
|
2017-05-24 12:25:39 +02:00 |
|
Sebastiaan Janssen
|
b9c418e458
|
Fix updating the actual lockout
|
2017-05-22 08:36:02 +02:00 |
|
Sebastiaan Janssen
|
aee06c4574
|
U4-9898 Reset password should unlock a locked account
|
2017-05-20 14:33:33 +02:00 |
|
Sebastiaan Janssen
|
33d09b14be
|
Refactor GetBackofficeUserManager calls
|
2017-04-29 22:21:42 +02:00 |
|