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

24135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Warren
bee2c2dd16 Merge remote-tracking branch 'origin/temp8' into temp8-serilog 
# Conflicts:
#	src/Umbraco.Web.UI/web.Template.Debug.config
 2018-07-30 16:42:15 +01:00
Warren
cd2a70a520 Get logger to output as same file as old Log4Net and in same format (only diff currently is the log level type in the log file) 
Ensures we use the calling type in the Umbraco ILogger and passes it onto Serilog
 2018-07-30 16:36:38 +01:00
Stephan
ff607aef7a Remove obsolete stuff 2018-07-30 14:04:02 +02:00
Stephan
2ce9d9f7dc Fix medias (broken by removing not-so-obsolete method) 2018-07-30 13:27:35 +02:00
Sebastiaan Janssen
6f409fdec2 Merge pull request #2803 from callumbwhyte/query-builder-updates 
V8 Hackathon: Query builder updates [v8hackaton]
 2018-07-30 12:43:49 +02:00
Sebastiaan Janssen
d03152c4f1 Merge pull request #2809 from LottePitcher/patch-1 
Update v8_getting_started.md after v8 hackathon [v8hackaton]
 2018-07-30 12:28:23 +02:00
Lotte Pitcher
1d4f6ba813 Update v8_getting_started.md 
Recommending people clone to the temp8 branch directly, and how to speed up the VS build
 2018-07-27 16:37:36 +01:00
Warren
cf47fb99f2 An initial test of seeing if Serilog is setup & can write out to a new file 2018-07-27 16:19:44 +01:00
Warren
5659624879 Adds Serilogs.Sink.File Nuget package 2018-07-27 15:53:24 +01:00
Warren
b774330e4f Updates Logger class to implement & call Serilog methods as opposed to Log4Net 
Unsure about the methods that take in args - have commented these out for now (Need to talk with Seb or Stephan about this)
 2018-07-27 15:49:40 +01:00
Warren
f6d81f397d Adds in Serilog & configures it to add in enrichers from the Nuget package & a custom one for the AppDomainAppId 2018-07-27 15:35:08 +01:00
Warren
f6c02fb543 Replaces Log4Net Shutdown in UmbracoAppBase Application_End event with Serilog CloseAndFlush- not 100% sure we need to do this as think LightInject tears it down nicely 2018-07-27 15:32:12 +01:00
Warren
0826928ffa Adds in Serilog.Enrichers.Process & Serilog.Enrichers.Thread Nuget Packages 
Removes AppDomainTokenConvertor - as we can add to SeriLog via a custom Enrich Property
 2018-07-27 15:30:25 +01:00
Warren
9909add9be Adds in Serilog core logging Nuget package to csproj & NuSpec to make build output happy 2018-07-27 14:38:34 +01:00
Warren
182f72a5f8 Rename init logger method to be non specific to what logging framework we use 2018-07-27 14:37:03 +01:00
Warren
a3b018c6b5 Remove lots of classes that was specific to extending/configuring Log4Net further 2018-07-27 14:28:58 +01:00
Warren
9dfe53fef8 Log4Net config files removed from disk & CSProj 
Removes references to Log4Net from Web.Config's
 2018-07-27 14:15:34 +01:00
Warren
dca7fb1763 Remove Log4Net from Umbraco.Web.UI AssemblyInfo 2018-07-27 13:59:59 +01:00
Warren
ac8d3579be Remove log4net of the types/assemblies to ignore TypeFinding checking in 2018-07-27 13:57:21 +01:00
Warren
6527abffd8 Remove Log4Net from the Core Nuget package Install PowerShell script 2018-07-27 13:53:33 +01:00
Warren
e3be68da07 Removes the logic for the Log4Net binding redirect 2018-07-27 13:51:17 +01:00
Warren
20540d9a15 Removes Log4Net NuGet packages & from our NuSpec's for Build scripts 2018-07-27 13:48:29 +01:00
Callum Whyte
154d36e580 Cleanup of template query builder whitespace 2018-07-27 13:02:37 +01:00
Callum Whyte
9162be9fb0 Updating template query builder to use new APIs 2018-07-27 13:01:54 +01:00
Sebastiaan Janssen
fd993f733f Merge pull request #2798 from LottePitcher/temp8 
In build.ps1, use .Path if .Source returns nothing
 2018-07-27 12:57:14 +02:00
Lotte Pitcher
e920d3f4b2 In build.ps1, use .Path if .Source returns nothing 2018-07-27 11:39:27 +01:00
Stephan
52bb935604 Merge pull request #2684 from jamescoxhead/U4-6231 
U4-6231 Refactored Umbraco.Web.WebServices classes
 2018-07-26 11:30:34 +02:00
Stephan
1f353da33c Cleanup IShortStringHelper if controller is gone 2018-07-26 11:23:06 +02:00
Stephan
8c88f8709b Fix merge 2018-07-26 11:22:53 +02:00
Stephan
eadd79771d Merge branch temp8 into temp8-6231 2018-07-26 10:42:35 +02:00
Stephan
8a3232bd23 Renormalize 2018-07-26 10:39:13 +02:00
Stephan
3c8a5c3a0d Remove obsolete code 2018-07-26 09:56:23 +02:00
Stephan
6f4ad059ef Cleanup 2018-07-26 09:41:43 +02:00
Sebastiaan Janssen
3ec31bb64d Merge pull request #2756 from kows/hackathon-export-doc-type-to-angular 
Rewrite exportdocumenttype.aspx to Angular [v8hackaton]
 2018-07-25 12:13:52 +02:00
Sebastiaan Janssen
3b771bf0f7 Download using the umbraco built-in download method and adds notification for success/error 2018-07-25 12:09:46 +02:00
Sebastiaan Janssen
b5c3b85298 Merge branch 'hackathon-export-doc-type-to-angular' of https://github.com/kows/Umbraco-CMS into kows-hackathon-export-doc-type-to-angular 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
#	src/Umbraco.Web.UI/Umbraco/dialogs/exportDocumenttype.aspx
#	src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx.cs
 2018-07-25 11:40:29 +02:00
Stephan
c7fabf84ba Merge branch origin/temp8 into temp8 2018-07-20 11:01:10 +02:00
Stephan
d7e97ac771 Remove unused CodeAnnotations attributes, obsolete stuff 2018-07-20 10:59:25 +02:00
Stephan
ef7be48cc5 Fix SqlTemplates concurrency 2018-07-20 10:41:22 +02:00
Shannon
5fdaa451b8 fixes null check on linkpicker changes with anchors, fixes ng-true-value constant value 2018-07-19 22:35:05 +10:00
Stephan
d36ec60039 Fix IPropertyValueConverter determining HasValue 2018-07-19 11:02:51 +02:00
Sebastiaan Janssen
09dd5cf879 Merge pull request #2781 from Mundairson/temp8-U4-11428 
U4-11428 CodeAnnotations classes have inconsistent constructor parameter order
 2018-07-19 09:18:17 +02:00
Mundairson
d7d36c34be Removed empty block comments. 2018-07-18 14:29:10 +01:00
Stephan
6c526b24a0 Post-merge fixes 2018-07-18 10:32:50 +02:00
Shannon
1f1bb37a57 merges lang files 2018-07-18 16:08:38 +10:00
Shannon
959caf4d04 Fixes tests and merging issues, simplifies TabsAndPropertiesResolver since it doesn't need umbracocontext, only the MemberTabsAndPropertiesResolver one does 2018-07-18 15:42:12 +10:00
Shannon
ec1d013004 Manually merges the IgnorePublishedContentCollisions change, removes more service locator pattern, removes ContextMapper with UmbracoContext and instead uses IUmbracoContextAccessor and adjusts some DI. 2018-07-18 14:34:32 +10:00
Shannon
66f9eb01c7 merge fixing and cleanup 2018-07-18 13:19:48 +10:00
Shannon
390514cd9d Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
#	src/Umbraco.Core/Persistence/PetaPoco.cs
#	src/Umbraco.Core/Persistence/PetaPocoSqlExtensions.cs
#	src/Umbraco.Core/Security/BackOfficeUserManager.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/FileService.cs
#	src/Umbraco.Core/Services/IFileService.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
#	src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
#	src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/routes.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/content/copy.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/config/splashes/noNodes.aspx
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	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/fr.xml
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/MemberTypeController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Routing/PublishedContentRequest.cs
#	src/Umbraco.Web/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
 2018-07-18 13:19:14 +10:00
Shannon Deminick
cf6a8956cd Merge pull request #2779 from umbraco/temp8-w112 
Variations with Compositions
 2018-07-18 11:32:59 +10:00