Shannon
|
890b5f30a1
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# src/Umbraco.Core/Configuration/UmbracoSettings/IRepositoriesSection.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/IRepository.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoriesCollection.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoriesElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryConfigExtensions.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs
# src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
# src/Umbraco.Core/Services/PackagingService.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementDefaultTests.cs
# src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementTests.cs
# src/Umbraco.Tests/Plugins/PluginManagerTests.cs
# src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
# src/Umbraco.Web.UI/config/umbracoSettings.config
# src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs
# src/umbraco.cms/umbraco.cms.csproj
|
2018-04-30 23:25:07 +10:00 |
|
Sebastiaan Janssen
|
bfca8c555e
|
Removes Package repository config setting and related unnecessary code
|
2018-04-19 19:12:42 +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 |
|
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
|
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
|
0a4878d2a3
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-27 10:04:07 +02:00 |
|
Shannon
|
69f7623fb7
|
Doh! we had test code checked in .. oops!
|
2018-03-16 14:40:26 +11:00 |
|
Sebastiaan Janssen
|
eac9785c45
|
Apply PR #2507
|
2018-03-15 10:02:20 +01:00 |
|
Shannon
|
171e0d87db
|
Updates some of the variable names, removes the EnabledFeatures since we don't really need that
|
2018-03-13 14:31:30 +11:00 |
|
Robert
|
557fc1bcdd
|
Removed hardcoded value for disabletemplate
|
2018-03-07 21:43:19 +01:00 |
|
Robert
|
dfb0efbc98
|
Removed option to assign templates from the info tab
|
2018-03-07 14:43:30 +01:00 |
|
Robert
|
728bf8b52d
|
Adding disableFeatures server variable and new DisableTemplate property in DisabledFeatures.cs
|
2018-03-07 14:03:35 +01:00 |
|
Shannon
|
e502db5f6f
|
U4-11021 No login form when trying to authorise 7.9 upgrade
|
2018-02-28 09:33:47 +11:00 |
|
Shannon
|
1d52f59657
|
Puts tours on the file system and loads them from an api controller
|
2017-11-09 00:41:59 +11:00 |
|
Stephan
|
ec6ba01cbf
|
So long Facade
|
2017-10-31 12:48:24 +01:00 |
|
Warren Buckley
|
7fd6155807
|
Bit too aggressive with the C# cleanup - adds back in HelpController but just with the method that is needed to load the videos in the help section
|
2017-10-10 16:05:21 +01:00 |
|
Warren Buckley
|
f634d9f8b1
|
Remove the Help/Lessons Controller from the globaly Umbraco.Sys JS object
|
2017-10-10 12:53:15 +01:00 |
|
Stephan
|
5ba2ffcbf3
|
CrLfTab
|
2017-09-23 10:08:18 +02:00 |
|
Mads Rasmussen
|
cb8157dfca
|
Start on a fresh help drawer branch - the other branch was a mess of testing data and nested content merges
|
2017-09-20 15:46:33 +02:00 |
|
Stephan
|
9ed6576908
|
Port 7.7 - WIP
|
2017-09-19 15:51:47 +02:00 |
|
Stephan
|
96c08f24ee
|
Port 7.7 - WIP
|
2017-09-12 16:22:16 +02:00 |
|
Claus
|
25cb76e842
|
Merge remote-tracking branch 'origin/dev-v7.7' into temp-U4-10333
# Conflicts:
# src/Umbraco.Web/Editors/UsersController.cs
|
2017-09-06 11:25:11 +02:00 |
|
Shannon
|
0dee1f0fac
|
U4-10368 Need option to set username different than e-mail for AD compatibility
|
2017-09-05 22:35:40 +10:00 |
|
Shannon
|
4b7bd6482e
|
Creates new EmailSender which should take the place throughout the codebase for sending emails in the Core. Have replaced most places where SMTP is used directly (but not the notifications part since that is more complicated right now). Added the internal event and special usage so we can raise an event to send an email if smtp is not configured.
|
2017-09-05 18:52:03 +10:00 |
|
Shannon
|
5dec4a4a94
|
Moves logic to separate UserGroupsController from the user controller, refactors a few model mappings to reduce a few lines of code, default permissions on user groups now save
|
2017-06-29 14:39:11 +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 |
|