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

24753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
copilaurobert
4fa595edd9 Content apps will now move into the tray based on window width 2018-08-21 11:09:10 +02:00
Mads Rasmussen
1c0d09a1cb Merge branch 'temp8' into temp8-93 2018-08-21 11:08:45 +02:00
Mads Rasmussen
e470436519 use overlayService to open media type child nodes overlay 2018-08-21 11:03:12 +02:00
Warren Buckley
3568a6565d Merge pull request #2863 from umbraco/temp8-95 
Temp8 95
 2018-08-21 10:03:10 +01:00
Mads Rasmussen
afadf9999b remove unused overlay markup 2018-08-21 10:32:20 +02:00
Mads Rasmussen
5671103cd2 remove unused overlay markup 2018-08-21 10:09:23 +02:00
Mads Rasmussen
75cc69454a convert move dialog to infinite editor 2018-08-21 10:06:16 +02:00
Mads Rasmussen
7bd8c35d37 update copy dialog markup to make it work as an infinite editor 2018-08-21 09:02:38 +02:00
copilaurobert
ab6d5d09e2 "More" button now shows a tray containing overflowing apps that passed the set app limit 2018-08-20 15:57:58 +02:00
Mads Rasmussen
880eff5e71 use editorService to open copy dialog 2018-08-20 15:54:36 +02:00
Mads Rasmussen
7ffa4969b9 move copy-files to new location 2018-08-20 15:51:38 +02:00
Mads Rasmussen
3b4e5ad8c9 Revert "move copy files to new location" 
This reverts commit 4c8c4e7578.
 2018-08-20 15:49:23 +02:00
Mads Rasmussen
4c8c4e7578 move copy files to new location 2018-08-20 15:48:23 +02:00
Mads Rasmussen
745ac7600d remove compositions from the editorService again 2018-08-20 14:42:18 +02:00
Mads Rasmussen
b58bce7c64 move confirm logic to compositions controller 2018-08-20 14:30:59 +02:00
Mads Rasmussen
ab25713486 remove unsed overlay component 2018-08-20 14:16:16 +02:00
Mads Rasmussen
97b8aa8b3a open compositions dialog through infinite editing 2018-08-20 13:13:02 +02:00
Mads Rasmussen
807f0be9df move compositions overlay to infinite editors folder 2018-08-20 11:18:58 +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
copilaurobert
4efc0c8be2 Initial commit on "more" button 2018-08-17 14:14:01 +02:00
Radu Orleanu
f665f8af89 fixing U4-11570 (#2860) 2018-08-17 14:04:35 +02:00
Mads Rasmussen
b7005127b2 add alias to user subviews to fix broken track by 2018-08-17 13:26:28 +02: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
Warren Buckley
0ee84c52b3 Merge pull request #2853 from umbraco/temp-variant-save-dialog 
Save dialog for variants
 2018-08-17 11:06:52 +01:00
Sebastiaan Janssen
c4163e94c0 Merge pull request #2856 from dawoe/remove-deleted-scripts-from-solution 
Removed files from solution that are not longer present in repo
 2018-08-17 08:25:50 +02:00
Sebastiaan Janssen
62855d021f Merge pull request #2857 from umbraco/temp-U4-11581 
U4-11581 In rare cases the umbracoLanguage table has a constraint ins…
 2018-08-17 08:24:43 +02: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
Shannon
cdf3581721 code simplification 2018-08-17 10:53:45 +10:00
Shannon
0c6cca44d8 Fixes SQL providers for returning the correct results for constraints 2018-08-17 10:53:21 +10:00
Shannon
f9300b4714 set variants to pristine after saving 2018-08-17 01:04:15 +10:00
Shannon
5324e0fc59 Fixes initial tree loading to ensure it gets passed the right culture params, puts any non-translated variant name in brackets in the tree 2018-08-17 00:50:05 +10:00
Warren
ce4a19a20a Update OWIN logger with message template properties - mostly used for user X logged in (however we can't log those messages with properties) :( 2018-08-16 15:24:45 +01:00
Shannon
3fac749b38 fixes tree syncing so that the name can be updated 2018-08-17 00:19:17 +10: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
Warren
bb7fd0af25 Another one got through the net 2018-08-16 14:47:42 +01:00
Warren
0fdccc9c2f Found another log item that was using string interpolation 2018-08-16 14:40:33 +01:00
Shannon
54af649b78 Cleans up some models, adds another unit test, fixes the Info tab state updating when a content item is changed. 2018-08-16 23:30:33 +10:00
Sebastiaan Janssen
b9e8dd8b86 Removes unused import statement 2018-08-16 13:47:20 +02:00
Warren
f9ba6970f4 Last pass of updating log messages in the solution 2018-08-16 12:42:21 +01:00
Warren
47c8651609 Update more logging messages to use templates as opposed to string formats that were using the LoggerExtensions <T> 2018-08-16 12:00:12 +01:00
Sebastiaan Janssen
45d8d302c9 U4-11581 In rare cases the umbracoLanguage table has a constraint instead of an index, making the migration fail 2018-08-16 12:10:21 +02:00
Shannon
b4378ecb26 Merge remote-tracking branch 'origin/temp8' into temp-variant-save-dialog 2018-08-16 19:21:27 +10:00
Shannon
5168ef0f7a Fixes js tests and some logic 2018-08-16 19:20:43 +10:00
Mads Rasmussen
1fadff105a Merge pull request #2849 from umbraco/temp-variants-with-file-uploads 
Editing variants with file uploads
 2018-08-16 10:43:47 +02:00
Dave Woestenborghs
e0ce9f1a77 Removed files from solution that are not longer present in repo 2018-08-16 10:35:08 +02:00
Sebastiaan Janssen
d7a0886097 Fixes problem where we try to query a table that hasn't been updated with the new column yet, so we can't use the DTO 2018-08-16 10:32:10 +02:00