yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,326 Commits 4 Branches 7 Tags
2c66cdc10239ce1b736d0b5400f78ee7a5e42aae
Commit Graph

189 Commits

Author SHA1 Message Date
Stephan
2c66cdc102 Merge branch temp8 into temp8-di2690 2018-07-31 14:50:01 +02:00
Shannon
d272dbf611 Merge branch 'dev-v7' into temp8 
# Conflicts:
#	build/NuSpecs/tools/Readme.txt
#	src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs
#	src/Umbraco.Core/Macros/MacroFieldEditorsResolver.cs
#	src/Umbraco.Core/Packaging/Models/PackageAction.cs
#	src/Umbraco.Core/PropertyEditors/PreValueField.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs
#	src/Umbraco.Core/Sync/ApplicationUrlHelper.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
#	src/Umbraco.Tests/Dependencies/NuGet.cs
#	src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs
#	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
#	src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml
#	src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml
#	src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml
#	src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml
#	src/Umbraco.Tests/Services/PerformanceTests.cs
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
#	src/Umbraco.Web.UI.Client/src/less/navs.less
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html
#	src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
#	src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI/Properties/Settings.Designer.cs
#	src/Umbraco.Web.UI/Properties/Settings.settings
#	src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml
#	src/Umbraco.Web.UI/config/feedProxy.Release.config
#	src/Umbraco.Web.UI/config/feedProxy.config
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
#	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/es.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/he.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/it.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
#	src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx
#	src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.contextmenu.js
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Install/InstallHelper.cs
#	src/Umbraco.Web/Install/InstallSteps/UpgradeStep.cs
#	src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
#	src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
#	src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs
#	src/Umbraco.Web/Properties/Settings.settings
#	src/Umbraco.Web/Properties/Settings1.Designer.cs
#	src/Umbraco.Web/Routing/PublishedContentRequest.cs
#	src/Umbraco.Web/Trees/PackagesTreeController.cs
#	src/Umbraco.Web/UI/LegacyDialogHandler.cs
#	src/Umbraco.Web/UmbracoModule.cs
#	src/Umbraco.Web/Web References/org.umbraco.our/Reference.map
#	src/Umbraco.Web/Web References/org.umbraco.our/repository.disco
#	src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl
#	src/Umbraco.Web/app.config
#	src/Umbraco.Web/umbraco.presentation/item.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadScripts.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/search.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/preview/PreviewContent.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/DocumentExtensions.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Nodes.cs
#	src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs
#	src/umbraco.MacroEngines/RazorDynamicNode/DynamicNodeList.cs
#	src/umbraco.businesslogic/ApplicationTree.cs
#	src/umbraco.businesslogic/BasePages/BasePage.cs
#	src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
#	src/umbraco.editorControls/uploadfield/uploadField.cs
 2018-07-31 14:57:20 +10:00
Imran Haider
2660b31370 Updated our.umbraco.org to .com 2018-07-27 16:41:57 +01:00
Imran Haider
7baca85f6a Update ourumbraco references to https 2018-07-27 16:08:38 +01:00
Stephan
9e9a0d301f Cleanup and Refactor 2018-07-20 09:49:05 +02:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
Shannon
9d49ddba7c Fixes installer including some c# bits, fixes the hash bang to be back to normal 2018-06-15 15:51:37 +10:00
Shannon
abbb119fc9 Ensures ref integrity for all FKs to umbracoUser table but support NULL values 2018-05-31 23:05:35 +10:00
Stephan
3495331005 Cleanup, get rid of warnings 2018-05-03 15:11:57 +02:00
Shannon
0a18306d40 More xslt removal 2018-05-01 00:45:05 +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
Stephan
553de2ea68 Cleanup ILogger 2018-04-03 16:15:59 +02:00
Stephan
62b6efc4da Fix upgrading 2018-03-30 10:28:49 +02:00
Stephan
c72ce0b759 Fix Examine PR, fix migrations and upgrades 2018-03-29 11:31:33 +02:00
Stephan
0a4878d2a3 Port v7@2aa0dfb2c5 - WIP 2018-03-27 10:04:07 +02:00
Stephan
10972002d9 Fix install issues with super user 2018-03-21 16:10:33 +01:00
Shannon
bd6dd13295 Updates the user Id to the new -1 2018-03-21 14:49:10 +11:00
Stephan
030c97ef26 Super user is not a Zero 2018-03-02 16:00:15 +01:00
Sebastiaan Jansssen
7746c4a014 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs
 2018-02-14 10:28:51 +01:00
Shannon
eae1ce7012 fixes build 2018-02-14 12:05:05 +11:00
Shannon
e900711180 Updates the CDF version changer to to use a hash of the current version and the date time so that it's not constantly updated if it's not changed. 2018-02-14 11:53:49 +11:00
Stephan
c3e6886ac0 DataType refactoring - in progress 2018-01-24 11:44:44 +01:00
Stephan
a9d9221548 Migrations refactoring - WIP - cleanup 2017-12-26 12:54:27 +01:00
Stephan
16c919c1a5 Migrations refactoring - WIP - plan 2017-12-22 16:14:09 +01:00
Stephan
2182b0f18f Migrations refactoring - WIP - move code 2017-12-19 11:00:46 +01:00
Shannon
2dc11f6fa1 Fixes new installation user login 2017-11-09 23:05:56 +11:00
Stephan
472cb41190 Begin implementing Constants.DatabaseSchema 2017-10-31 18:03:40 +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
ee1941b9bf Refactor ISqlContext and SqlTemplates 2017-09-22 18:30:38 +02:00
Stephan
9ed6576908 Port 7.7 - WIP 2017-09-19 15:51:47 +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
Shannon
59afcd8be7 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-09-12 13:38:34 +10:00
Sebastiaan Janssen
c55cf75ada Use HttpContext from the controller 2017-09-11 13:30:06 +02:00
Sebastiaan Janssen
23950c0cac U4-10400 Clear CDF temp files during upgrades 2017-09-11 12:22:38 +02:00
Stephan
1c96df83cd Port 7.7 - WIP 2017-09-08 19:39:13 +02:00
Shannon
e71e9d7efb U4-10249 FolderAndFilePermissions HealthCheck causes the application to restart 
(cherry picked from commit bdb991f6dc)
 2017-08-24 18:51:53 +02:00
Shannon
bdb991f6dc U4-10249 FolderAndFilePermissions HealthCheck causes the application to restart 2017-08-18 14:50:20 +10:00
Shannon
150e2b12e8 adding back the functionality to install a machine key during installation 2017-08-02 16:16:59 +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
Stephan
41cc622260 Current.DistributedCache 2017-07-11 19:13:45 +02:00
Shannon
d885265818 Changes restart tracking to use code we used to have in there which is an in memory marker for the app domain, this is a little cleaner 2017-06-19 23:40:51 +10: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
Stephan
8561d85f7a porting 7.6-rc1 into 8 2017-05-24 12:25:39 +02:00
Shannon
944b3dcaac New method for IPackagingService to fetch a package from the repo, removes usages of the old repo endpoint, removes ability to push a package from the back office to Our since that would require a different endpoint. 2017-04-26 19:02:36 +10:00
Shannon
a71ec8dd81 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 2017-02-07 12:50:44 +11:00
hartvig
32892cf5e0 Update NewInstallStep.cs 2017-02-02 10:05:14 +01:00