yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,222 Commits 4 Branches 7 Tags
162b90194de27d3353aba0dbe53bc5bc6cc14a8b
Commit Graph

4333 Commits

Author SHA1 Message Date
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
c743ac760d Update ModelsBuilder to -alpha.22 2018-08-28 20:02:25 +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
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
91ab3b4894 Comments out a lot of the serilog.user.config to give some guidance and examples on what can be setup & configured 2018-08-28 10:11:08 +01:00
Stephan
a2e80f27f3 Merge branch temp8 into temp8-11502 2018-08-27 09:57:41 +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
Chris Houston
56de9ff4ae Fix for issue: U4 11409 - "Create content" tour is failing when doing the tour with the starter kit installed (#2851) 2018-08-26 14:52:14 +02:00
Sebastiaan Janssen
18b690f11a Bump the version to 7.12.2 2018-08-23 20:45:49 +02:00
Sebastiaan Janssen
919a63d0ea Merge pull request #2848 from readingdancer/U4-11569 
Small tweaks to the Getting Started tour text.
 2018-08-23 18:53:40 +02:00
Mads Rasmussen
ef6822e15b Merge pull request #2873 from kjac/media-picker-update 
Media picker: Minor style update + add help text.
 2018-08-23 09:29:05 +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
Kenn Jacobsen
de8a24c691 Add "info" style to upload button + add help text when the dropzone is hidden. 2018-08-17 12:22:54 +02:00
Shannon
f8370a04a2 Fixes tracking the state of variants in the header drop down when the state changes but validation fails 2018-08-17 00:00:29 +10:00
Sebastiaan Janssen
39e8a9fa67 Bump version to 7.12.1 2018-08-15 15:47:21 +02:00
Shannon
30d29d9fcf initial commit for save dialog 2018-08-13 16:45:05 +10:00
Chris Houston
ba682d95dc Small tweaks to the Getting Started tour text. 2018-08-12 01:16:57 -04:00
Warren
1f9c5a48a7 Fix up .csproj after merge & update CMS.Core nuspec to include the new Serilog nuget packages we've added 2018-08-10 16:44:36 +01:00
Warren
054308b44e Merge remote-tracking branch 'origin/temp8-directive-cleanup' into temp8-serilog 2018-08-10 15:37:50 +01:00
Warren
212e0a091a Allows Serilog to be configured in a serilog.user.config file that will not effect the main umbraco logger 
Adds in support for filtering expressions - so the user logger configuration can filter by including or excluding on an expression - common use case to include only my namespace from SourceContext thjat starts with xyz
 2018-08-09 22:08:40 +01:00
Shannon
9d7519d591 manually merges noscript update 2018-08-09 15:10:27 +10:00
Warren
00487c87fc Merge branch 'temp8' into kows-hackathon-import-doc-type-to-angular 2018-08-08 13:23:41 +01:00
Robert
c2433a336c Merge branch 'temp8' into temp-editing-all-variants 2018-08-08 13:46:19 +02:00
Warren
44e76adbd1 Merge branch 'hackathon-import-doc-type-to-angular' of https://github.com/kows/Umbraco-CMS into kows-hackathon-import-doc-type-to-angular 
# Conflicts:
#	src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
 2018-08-08 12:01:15 +01:00
leekelleher
0869a9be69 Removed Form.browser 
ref: http://issues.umbraco.org/issue/U4-11555

Also removed the referenced classes...

- FormRewriterControlAdapter
- UrlRewriterFormWriter
- LegacyRequestInitializer

These were being used to rewrite the `action` value on rendered `<form runat=server>` tags, (a la WebForms).
 2018-08-08 11:32:19 +01:00
leekelleher
79eb9fc2e7 Removed w3cvalidator.browser 
ref: http://issues.umbraco.org/issue/U4-11555
 2018-08-08 10:34:08 +01:00
leekelleher
92273f263b U4-11556 V8 - Removed metablogConfig.config 
http://issues.umbraco.org/issue/U4-11556

For v7, I've marked the `SystemFiles.MetablogConfig` strings as deprecated.
 2018-08-08 10:23:14 +01:00
Shannon
f921e891a3 Fixes issue with IsEdited and state to make things consistent and easy 2018-08-08 16:29:07 +10:00
Warren
6372d393ee Merge branch 'dev-v7' into temp8 == Shan or Stephan please review this ! 
* Contains a change to work with V8 - content.notify.controller sends a string array
* C# ContentController methods reworked to newer services available & API POST is model bound to string array

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/editorsettings/editorsettings.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/insertfield/insertfield.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.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/dialogs/notifications.aspx
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/notifications.aspx.designer.cs
 2018-08-07 15:48:21 +01:00
Mads Rasmussen
a4155ad6d8 Update save and publish button text 2018-08-07 14:22:17 +02:00
Warren Buckley
1f1a4ac15c Remove 64Bit IISExpress config in CSProj 2018-08-07 09:16:36 +01:00
Mike
2b6c6b3022 http://issues.umbraco.org/issue/U4-10801 
Fixes label ui issue on template editor ui.

Updated notification settings ui to use angular instead of web forms.
 2018-08-06 19:52:29 +01:00
Warren
a242d13bb9 Fix up missing .aspx tag control reference for ProtectPage dialog 2018-08-06 12:24:43 +01:00
Warren
4730ee317b Removes some unused .aspx files for dictionary editing - no longer needed as we now have this in Angular 2018-08-06 11:52:12 +01:00
elitsa
fc7db11c6c Changed the Danish language file - added the Dictionary title 2018-08-06 10:45:51 +02:00
Shannon
7aaf024397 more work on validation, saving and publishing 2018-08-06 16:50:40 +10:00
Warren
237fcbead6 Last of the umbraco_client files removed 2018-08-03 09:25:33 +01:00
Warren
01a2988737 Tablesorting 3rd party lib is removed 2018-08-02 20:33:38 +01:00
Mads Rasmussen
1e5db34679 add empty state and error handling for save 2018-08-02 19:22:17 +02:00
Warren
b0ca59b0ab OLD sort dialog.aspx & its JS assets from umbraco_client have vanished into thin air 2018-08-02 15:05:18 +01:00
Warren
fee48e9dee To get the build to work - need to push these commented out classes for now that reference MenuButton (I think EditMacro, EditPackage & EditDictionaryItem) are no longer loaded this way AFAIK but I need to check 2018-08-02 14:06:05 +01:00
Andy Hawken (SP4)
afa27ce872 Tour Step 7 Wording 
Change wording of tour step 7 to "Now click on" to indicate that clicking on the avatar is a step in the tour, rather than a description of what it does at runtime
 2018-08-02 13:34:30 +01:00
Warren
08991dc98c Removes old modal js lib & references 2018-08-02 11:58:10 +01:00
Warren
c0ccc79604 Remove another AssignDomain dialog & Punycode lib which was only used in AssignDomain2 dialog 2018-08-02 11:36:13 +01:00
Warren
b59c7d8af6 Remove AssignDomain JS & CSS assets from umbraco_client 2018-08-02 11:33:14 +01:00
Shannon
1f25847cd7 Gets contextual culture server validation working 2018-08-02 20:00:35 +10:00