4ef2d27da2
Fix various build issues
2018-09-10 16:23:27 +02:00
64384dc8b3
Merge remote-tracking branch 'origin/temp8-MOAR-LOGGING' into temp8-logviewer
2018-09-10 10:31:16 +01:00
e6ef924b1b
init commit to getting preview working
2018-09-10 11:34:31 +10:00
010a2e012e
Clean up multiple textstring(repeatable textstring) view - ( #2934 )
...
* Clean up multiple textstring(repeatable textstring) view - Introduced some styling rules to make the view look cleaner
* Removes unnecessary additional included files from csproj
2018-09-07 14:54:20 +02:00
9d6c287028
Merge branch 'temp8' into temp8-ui-cleanup
2018-09-07 14:20:31 +02:00
03f204c22f
deletes old webform files not referenced in the project
2018-09-07 17:01:52 +10:00
8ff671a7c6
Changes compilation batch mode to true uses Roslyn compiler for views
2018-09-07 13:10:55 +10:00
31f84ff130
Merge branch 'temp8' into temp8-ui-cleanup
2018-09-06 16:32:47 +02:00
7a1744a38b
Merge branch temp8 into temp8-11502
2018-09-06 16:07:32 +02:00
04c654c290
Fix merges
2018-09-06 15:59:10 +02:00
33df7647d2
Merge pull request #2900 from umbraco/temp8-validation-quirks
...
v8 validation quirks
2018-09-06 15:00:05 +02:00
bbd8315176
Merge remote-tracking branch 'origin/temp8' into temp8-nuget-pkgs
2018-09-06 13:57:34 +02:00
612c38654d
Merge branch origin/dev-v7 into temp8
2018-09-06 13:07:09 +02:00
e8e2a21e9f
Handle binding redirects
2018-09-04 19:44:24 +02:00
e0c0bc7da4
Update getting started tour template tour - to use Model.Name as opposed to older Model.Content.Name
2018-09-04 13:29:42 +01:00
7611f89642
Update nuspec and dependencies
2018-09-04 13:42:04 +02:00
e221a1af36
fix the rest of the create media tour
2018-09-04 13:35:31 +02:00
54255b41a0
make special zIndex's for the tour
2018-09-04 11:17:27 +02:00
5b3b160f3b
Make header styling consistent
2018-09-04 10:27:53 +02:00
b8f141982b
fix create doc type tour
2018-09-04 09:42:34 +02:00
3f4e6dfce8
Gets success notifications showing in the save/publish dialogs
2018-09-04 16:16:11 +10:00
34fb19ac76
Merge remote-tracking branch 'origin/temp8' into temp8-nuget-pkgs
2018-09-03 17:24:58 +02:00
f9657ae04d
Gets mixed validation and success messages returning when persisting multiple variants at once.
2018-09-04 01:13:26 +10:00
b72fc95d1f
fix up getting started and create content tours
2018-09-03 16:02:39 +02:00
d8cd2c109f
Merge branch 'feature/remove-logout-aspx' of https://github.com/imranhaidercogworks/Umbraco-CMS into imranhaidercogworks-feature/remove-logout-aspx
...
# Conflicts:
# src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
2018-08-31 21:07:32 +02:00
c42f3a1158
Merge branch temp8 into temp8-11502
2018-08-31 08:43:11 +02:00
f450abb5c2
wip clean up doc type editor
2018-08-30 19:42:30 +02:00
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
cce70f139c
Changed to LogViewer as Logs in solution refers to AuditLogs so this makes it more explicit
2018-08-30 09:59:53 +01:00
541e546f7b
u4-8310 - Added error message to the xml file.
2018-08-29 14:35:20 +01:00
aed9ad3a66
Merge remote-tracking branch 'origin/temp8' into temp8-nuget-pkgs
...
# Conflicts:
# build/NuSpecs/UmbracoCms.nuspec
2018-08-29 12:24:38 +10:00
09ee58ddad
Removes more refs to umbraco_client, fixes up nuspecs
2018-08-29 10:49:55 +10:00
c743ac760d
Update ModelsBuilder to -alpha.22
2018-08-28 20:02:25 +02:00
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
fbd48b0bd7
Merge commit 'a151829b265b2b6def44b6df76668657469941f6' into temp8-logviewer
...
# Conflicts:
# src/Umbraco.Web.UI.Client/bower.json
2018-08-28 14:53:00 +01:00
a151829b26
Merge pull request #2845 from umbraco/temp8-serilog
...
Bye bye Log4Net, Hello Serilog
2018-08-28 20:31:12 +10:00
3e75c69f10
Merge branch 'temp8-serilog' into temp8-logviewer
2018-08-28 11:27:11 +01:00
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
a2e80f27f3
Merge branch temp8 into temp8-11502
2018-08-27 09:57:41 +02:00
8666b222ac
Merge pull request #2841 from leekelleher/U4-11556
...
U4-11556 - Removed metablogConfig.config
2018-08-26 18:04:50 +02:00
9e564d70ef
Merge branch 'drpeck-U4-8550' into dev-v7
2018-08-26 17:57:00 +02:00
276810be6c
Bump to v7.13.0
2018-08-26 17:56:13 +02:00
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
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
1a89fea816
Adds a Logs Tree controller in the Developer section
2018-08-24 10:53:53 +01:00
18b690f11a
Bump the version to 7.12.2
2018-08-23 20:45:49 +02:00
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
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
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
de8a24c691
Add "info" style to upload button + add help text when the dropzone is hidden.
2018-08-17 12:22:54 +02:00
Stephan