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

24579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
37db8516ed move template sections overlay to infinite editors 2018-08-01 13:13:09 +02:00
Mads Rasmussen
d7c0a92d9f update insert code snippet infinite editor to use new insert field editor 2018-08-01 12:30:31 +02:00
Mads Rasmussen
d88ed02a8d use insert field infinite editor in template, partial views and macro partial views editors 2018-08-01 11:47:48 +02:00
Mads Rasmussen
4cc31a62c0 convert insertfeld overlay to an infinite editor 2018-08-01 11:46:28 +02:00
Warren
2ec18d0489 Bit of a hack - adds extra whitespace behind Log4Net Levels in our enricher so that they are all 5 characters in length and logfile aligns nicely as it used to in old Log4Net setup 2018-08-01 10:44:20 +01:00
Warren
c59912ce94 Adds in SourceContext property into text log file that was missing - aka C# class/namespace 2018-08-01 10:43:14 +01:00
Warren
cfebb335f2 Merge remote-tracking branch 'origin/temp8' into temp8-serilog 2018-08-01 10:34:14 +01:00
Warren
b89e7bca97 Adds our Serilog Enricher so that we can map Serilog log levels to Log4Net levels and use it the text log file so that the logfiles still look the same as previously 2018-08-01 10:33:38 +01:00
Sebastiaan Janssen
8c5e20c8fe Merge pull request #2830 from karltynan/dev-v7 
Updated some lang files grammar
 2018-08-01 10:59:59 +02:00
Stephan
f049d1b479 Ensure PublishedRequest always has a culture 2018-08-01 10:42:50 +02:00
Karl Tynan
db2d7687e4 And updated the en_us.xml version too 2018-08-01 09:23:15 +01:00
Karl Tynan
c97311607d Improved text for email and capitalisation for URL 2018-08-01 09:22:45 +01:00
Karl Tynan
dbd9db780c Also updated the en_us.xml 2018-08-01 09:11:19 +01:00
Karl Tynan
04775098fe Updated some grammar on en.xml 2018-08-01 09:10:40 +01:00
Mads Rasmussen
4ede57836e move insertfield files to new location 2018-08-01 09:51:44 +02:00
Warren
bfae07b95b Merge remote-tracking branch 'origin/temp8' into temp8-serilog 2018-08-01 08:45:12 +01:00
Shannon
778a557f3c Gets the correct content posting which now binds and validates on the server properly 2018-08-01 17:28:39 +10:00
Shannon
6a94694f16 Got models pulled apart and simplified, much less inheritance and easier to follow, start wiring up the model binding logic for content along with validation for each variant 2018-08-01 16:46:13 +10:00
Sebastiaan Janssen
638f71d80e Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/mocks/services/localization.mocks.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	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/dashboard/default/StartupDashboardVideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
 2018-08-01 08:45:18 +02:00
Sebastiaan Janssen
f849ca38fc Merge pull request #2829 from readingdancer/U4-11551 
Fixing various broken links in the source code
 2018-08-01 08:04:20 +02:00
Shannon
c073ab2731 WIP still pulling apart models, binders, validators 2018-08-01 15:40:54 +10:00
Sebastiaan Janssen
11aea0f515 We need to create the template from it's alias, which is the safeAlias, which is the correct filename 
Relates to: https://github.com/umbraco/Umbraco-CMS/pull/2828#issuecomment-409452155
 2018-08-01 07:18:44 +02:00
Sebastiaan Janssen
d803aeb205 Merge pull request #2827 from umbraco/temp-U4-11059 
Changing the document type alias before first save leads to YSOD
 2018-08-01 07:17:07 +02:00
Chris Houston
9663cfde82 Fixed issue with creating doctypes & templated with an Ampersand : http://issues.umbraco.org/issue/U4-11550 (#2828) 2018-08-01 07:16:38 +02:00
Shannon
fc3c8bab45 Merge branch 'temp8' into temp-editing-all-variants 2018-08-01 15:16:02 +10:00
Sebastiaan Janssen
1d5a807e0d Merge pull request #2826 from bjarnef/dev-v7-U4-9025-3 
U4-9025 - Fix styling of prevalues
 2018-08-01 06:43:29 +02:00
Chris Houston
bb59c4708d Just triggering AppVeyor :) 
As per my other pull request, pretty sure the one unit test failed due to it running close to midnight on the last day of the month.
 2018-08-01 00:30:44 -04:00
Chris Houston
23fda3a0ed Fixing various broken links in the source code, some are just in comments and others are actually used within Umbraco, also added HTTPS where possible. 2018-07-31 23:00:46 -04:00
Shannon
35af025ae3 fixes migrations for v8 2018-08-01 12:37:44 +10:00
Shannon
dfc8f3837a Merge branch 'temp8' into temp-editing-all-variants 2018-08-01 12:36:45 +10:00
Shannon
19851b6986 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/AddRelationTypeForMediaFolderOnDelete.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/IncreaseLanguageIsoCodeColumnLength.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/UpdateUmbracoConsent.cs
#	src/Umbraco.Core/Persistence/PetaPoco.cs
#	src/Umbraco.Core/PluginManager.cs
#	src/Umbraco.Core/Services/Implement/UserService.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
#	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
#	src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/datatype.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/mediatype.resource.js
#	src/Umbraco.Web.UI/Umbraco/developer/Packages/DirectoryBrowser.aspx.cs
#	src/Umbraco.Web/Install/FilePermissionHelper.cs
#	src/Umbraco.Web/Trees/PackagesTreeController.cs
#	src/Umbraco.Web/UI/JavaScript/UmbracoClientDependencyLoader.cs
#	src/Umbraco.Web/UmbracoModule.cs
#	src/Umbraco.Web/umbraco.presentation/content.cs
#	src/Umbraco.Web/umbraco.presentation/requestModule.cs
#	src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
#	src/umbraco.cms/businesslogic/Content.cs
#	src/umbraco.cms/businesslogic/Packager/PackageActions/publishRootDocument.cs
 2018-08-01 12:26:26 +10:00
Shannon
f36a23dd42 WIP sln builds now 2018-08-01 12:16:03 +10:00
Shannon
55e1a792da Fixes migrations for 7.12.0 2018-08-01 12:15:18 +10:00
Shannon
5eedfc2a53 Merge remote-tracking branch 'origin/temp8' into temp-editing-all-variants 
# Conflicts:
#	src/Umbraco.Web/Editors/ContentController.cs
 2018-08-01 11:56:46 +10:00
Bjarne Fyrstenborg
a6d9b4b260 Add text-overflow for long labels 2018-07-31 23:25:56 +02:00
Warren
7ea85c26a7 Merge remote-tracking branch 'origin/temp8' into temp8-serilog 2018-07-31 22:07:24 +01:00
Warren
1a69297c7e Changes in tests proj to not use Log4Net but Serilog 
However not sure how this is used to where the output of the logs was viewed when it was set/configured to console - VS Output Window, VSTS Logs?
 2018-07-31 22:03:41 +01:00
Sebastiaan Janssen
4422c5ec52 Update AllowedTemplates list as well if the doctype alias is not the generated one 2018-07-31 22:39:22 +02:00
Bjarne Fyrstenborg
c4fc5a04f9 Adjust color picker prevalues to fit within overlay 2018-07-31 22:16:33 +02:00
Bjarne Fyrstenborg
63bbbbab31 Adjust multivalues styles 2018-07-31 22:15:30 +02:00
Sebastiaan Janssen
fc6dc25224 Merge pull request #2825 from readingdancer/U4-11472 
Fixes issue #U4-11472
 2018-07-31 22:03:49 +02:00
Sebastiaan Janssen
fe914dc339 Also make sure the alias gets generated from the full name and not just the part before the & 2018-07-31 22:01:35 +02:00
Mads Rasmussen
23136c5f4f Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-07-31 20:49:24 +02:00
Mads Rasmussen
1bdd848582 Post-merge color picker fixes 2018-07-31 20:48:44 +02:00
Warren
eda6c62fcc Minor change so that the text log filenames match better to old log4net style - adds in an extra . between Machine Name and the Date that gets added 2018-07-31 18:08:58 +01:00
Warren
5f226e7874 Adds in MachineName into the logfiles like we did previously 2018-07-31 16:15:07 +01:00
Chris Houston
a2cb5fac98 Fixes issue #U4-11472 
Document type, Media Type & Data Type folders did not support Ampersands in their names, now they do.
 2018-07-31 11:06:06 -04:00
Warren
aed9f77f31 Remove log4net from the typefinder tests 2018-07-31 15:44:59 +01:00
Warren
8331abf4a2 Remove log4net from Tests & Benchmark projects 2018-07-31 15:42:20 +01:00
Warren
0c3601435e Removes mention of Log4Net & removes commented out methods 2018-07-31 15:31:43 +01:00