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

6928 Commits

Author SHA1 Message Date
Stephan
69e8b11a79 Fix tests 2018-09-07 11:43:57 +02:00
Stephan
04c654c290 Fix merges 2018-09-06 15:59:10 +02:00
Mads Rasmussen
33df7647d2 Merge pull request #2900 from umbraco/temp8-validation-quirks 
v8 validation quirks
 2018-09-06 15:00:05 +02:00
Stephan
d9d51584ea Fix merge 2018-09-06 14:10:26 +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
Stephan
a1a06609b9 Version 8.0.0-alpha.50 with 3 NuGet packages 2018-09-04 09:36:58 +02:00
Stephan
34fb19ac76 Merge remote-tracking branch 'origin/temp8' into temp8-nuget-pkgs 2018-09-03 17:24:58 +02:00
Stephan
4a32eebb0b Cleanup logging 2018-08-30 19:08:55 +02:00
Shannon
506d57ab07 Allows the overlay view to be created with a custom parent scope so that broadcast/emit work correctly for the code within the overlay to be a 'child' of the editor that invoked it. 2018-08-30 20:21:25 +10:00
AJ_Dhaliwal
cc680f2cfb Fix comment regarding the length of the salt bytes array 2018-08-30 18:03:44 +08:00
Stephan
069c42ef36 Ensure all ILogger impl support message templates 2018-08-30 10:48:27 +02:00
Stephan
9e07bf0948 Improve ILogger documentation 2018-08-29 09:12:14 +02:00
Shannon
aed9ad3a66 Merge remote-tracking branch 'origin/temp8' into temp8-nuget-pkgs 
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
 2018-08-29 12:24:38 +10:00
Shannon
09ee58ddad Removes more refs to umbraco_client, fixes up nuspecs 2018-08-29 10:49:55 +10:00
Stephan
f791198817 Version 8.0.0-alpha.49 for ModelsBuilder 2018-08-28 18:45:37 +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
Stephan
eaacdc0514 Deal with fixmes in IContent IsCultureSomething 2018-08-28 15:11:13 +02:00
Shannon Deminick
a151829b26 Merge pull request #2845 from umbraco/temp8-serilog 
Bye bye Log4Net, Hello Serilog
 2018-08-28 20:31:12 +10:00
Warren
34452e72c0 Adds the shared option to the File sink to avoid file locking & if app restarts we don't get _001 or _002 files etc 2018-08-28 09:46:51 +01:00
Shannon
94cbe3b1b8 updates timing id 2018-08-28 15:40:20 +10:00
Shannon
6506abd451 Simplifies logger calls to proxy all calls to a single method of it's type 2018-08-28 15:38:36 +10:00
Shannon
8d6e297c37 Adds additional Fatal methods to match Error and move Fatal code above error so all logger code goes from Fatal -> Verbose 2018-08-28 15:24:45 +10:00
Sebastiaan Janssen
7fd1617759 Merge branch 'dev-v7' into validate-using-schema 2018-08-26 23:13:08 +02:00
Sebastiaan Janssen
8666b222ac Merge pull request #2841 from leekelleher/U4-11556 
U4-11556 - Removed metablogConfig.config
 2018-08-26 18:04:50 +02:00
Sebastiaan Janssen
9e564d70ef Merge branch 'drpeck-U4-8550' into dev-v7 2018-08-26 17:57:00 +02:00
Sebastiaan Janssen
276810be6c Bump to v7.13.0 2018-08-26 17:56:13 +02:00
Sebastiaan Janssen
49df6e7c9d Merge branch 'U4-8550' of https://github.com/drpeck/Umbraco-CMS into drpeck-U4-8550 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/PublishedContentExtensions.cs
 2018-08-26 17:45:34 +02:00
Sebastiaan Janssen
a411c9c300 Make sure inactive users get the correct state attached to them 2018-08-26 17:23:52 +02:00
Sebastiaan Janssen
342ac7b1b2 Merge branch 'U4-11166' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-11166 2018-08-26 16:52:58 +02:00
Sebastiaan Janssen
d83bb6aa49 Whoops, committed the wrong file! Revert "Fixes U4-11584 RelatedLinks2 throws exception with null value in Link field" 
This reverts commit 612138f0e1.
 2018-08-24 11:07:55 +02:00
Sebastiaan Janssen
612138f0e1 Fixes U4-11584 RelatedLinks2 throws exception with null value in Link field 2018-08-24 10:49:39 +02:00
Sebastiaan Janssen
bfc627857d Merge pull request #2840 from WebCentrum/temp-U4-11527 
U4-11527 Fix concurrency issue
 2018-08-24 00:02:30 +02:00
Thomas Nielsen
68ac84aa1d Sort the Umbraco.UserPicker list alphabetically by name (#2872) 2018-08-23 22:15:28 +02:00
Sebastiaan Janssen
18b690f11a Bump the version to 7.12.2 2018-08-23 20:45:49 +02:00
Warren
24f91f1917 Adds in Error without ex for just a message and a message template with params 2018-08-23 14:43:38 +01:00
Warren
fb4b0ceb69 Verified the log works correctly from my TODO note 2018-08-23 13:23:40 +01:00
Warren
afebd88d45 Update ImageProcessorLogger - to use the new Error logger method that contains only an ex - and under the hood it will pass on an empty string to the message 2018-08-23 12:26:33 +01:00
Warren
0c9ac7fa45 Make Log4NetLevel enricher internal - no need for it to be public 2018-08-23 12:16:43 +01:00
Warren
66e4e1f0f4 Adds new method to ILogger for taking only the exception - NOTE will add an empty string for the message 2018-08-23 12:14:07 +01:00
Shannon
c164a4789b Fixes Slider 2018-08-22 14:13:33 +10:00
Warren
3baf5697e4 Add in MachineName as a Serilog property 2018-08-21 12:48:06 +01:00
Sebastiaan Janssen
e6597d47e3 Fixes U4-11574 - return an empty string if the datatype is in "single" mode and nothing is selected 2018-08-20 16:12:23 +02:00
Shannon
04db0caa63 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseSchemaCreator.cs
#	src/Umbraco.Core/Migrations/Upgrade/V_7_12_0/AddRelationTypeForMediaFolderOnDelete.cs
#	src/Umbraco.Core/Migrations/Upgrade/V_7_12_0/IncreaseLanguageIsoCodeColumnLength.cs
#	src/Umbraco.Core/Persistence/DatabaseModelDefinitions/ConstraintDefinition.cs
#	src/Umbraco.Core/Persistence/DatabaseModelDefinitions/DbIndexDefinition.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroPropertyTable.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AddIndexToCmsMacroTable.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagsTable.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AssignMissingKeysAndIndexes.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenEightZero/AddIndexToPropertyTypeAliasColumn.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/AddForeignKeysForLanguageAndDictionaryTables.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MigrateAndRemoveTemplateMasterColumn.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/UpdateUniqueIdToHaveCorrectIndexType.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwoZero/AddMissingForeignKeyForContentType.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSixTwoZero/AdditionalIndexesAndKeys.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/ISqlSyntaxProvider.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/MySqlSyntaxProvider.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/SqlServerSyntaxProvider.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderBase.cs
#	src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderExtensions.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
#	src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs
#	src/Umbraco.Web/Scheduling/KeepAlive.cs
#	src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
 2018-08-20 15:16:58 +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
38984181fc Adds the Fatal Logger Extension method <T> 2018-08-17 11:38:31 +01:00
Warren
a020d60f3e Adds in new log level from Serilog to our Umbraco ILogger - Fatal (Worse than Error) 2018-08-17 11:26:22 +01:00
Shannon
49430ca0a5 fixes logic order of dropping indexes 2018-08-17 16:07:53 +10:00
Shannon
9d75e36eb4 Ensures that checking for constraints/indexes is done within the transaction before dropping anything instead of before the transaction. 2018-08-17 15:20:12 +10:00
Shannon
5068b8ae9f Fixes DB schema validation 2018-08-17 11:16:10 +10:00