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

6775 Commits

Author SHA1 Message Date
Mads Rasmussen
08c1a2d095 grid rte - use infinite editors instead of overlays 2018-08-21 16:07:38 +02:00
Mads Rasmussen
6a0dc77be3 remove unused overlay markup 2018-08-21 15:55:15 +02:00
Mads Rasmussen
8280b522a5 use infinite media picker in markdown editor 2018-08-21 15:51:53 +02:00
Mads Rasmussen
3ed76a34b9 remove unused overlay markup 2018-08-21 15:34:56 +02:00
Mads Rasmussen
e18598e836 use infinite icon picker in list view prevalues 2018-08-21 15:31:16 +02:00
Mads Rasmussen
f35c1866b9 remove icon picker overlay 2018-08-21 15:23:54 +02:00
Mads Rasmussen
564eb0f059 remove media picker overlay 2018-08-21 15:23:24 +02:00
Mads Rasmussen
b6ca017033 add feature toggle for edit media in media picker 2018-08-21 15:17:24 +02:00
Mads Rasmussen
c81ce94f1f use infinite media picker in link picker 2018-08-21 14:54:11 +02:00
Mads Rasmussen
892a88179e rename controller 2018-08-21 14:30:06 +02:00
Mads Rasmussen
fab08f4dde convert linpicker overlay to infinite editor 2018-08-21 14:29:21 +02:00
Mads Rasmussen
bc1c400481 open link picker and media picker infinite editors from rte 2018-08-21 14:13:27 +02:00
Mads Rasmussen
f02382d3ab add linkpicker to editorService 2018-08-21 14:12:57 +02:00
Mads Rasmussen
b9b45336d4 move linkpicker to new location 2018-08-21 13:38:29 +02:00
Mads Rasmussen
08eaf16f11 turn embed overlay into infinite editor 2018-08-21 12:54:23 +02:00
Mads Rasmussen
bdcbb0511f move embed overlay to new location 2018-08-21 12:41:39 +02:00
Mads Rasmussen
55a9fec64f embed overlay was broken. now its fixed 2018-08-21 12:40:24 +02:00
Mads Rasmussen
3c8b43cc3b use infinite macro picker in RTE 2018-08-21 11:29:04 +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
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
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
Mads Rasmussen
b7005127b2 add alias to user subviews to fix broken track by 2018-08-17 13:26:28 +02: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
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
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
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
Warren Buckley
5b4ef5b29e Merge pull request #2854 from umbraco/temp8-w155 
Removed double encoding
 2018-08-15 12:45:37 +01:00
Mads Rasmussen
8ce93055ef update colors to use variables and match the new color scheme 2018-08-15 13:00:40 +02:00
Mads Rasmussen
ee4b2adbd4 prefix all nested content css classes with "umb" 2018-08-15 11:59:06 +02:00
copilaurobert
5da220c436 Removed double encoding 2018-08-15 10:32:59 +02:00
Shannon
0910a46b8a Merge remote-tracking branch 'origin/temp-variants-with-file-uploads' into temp-variant-save-dialog 2018-08-15 17:29:40 +10:00
Shannon
66a00546d1 more work with saving, publishing and validation for variants, fixes up a few old things too 2018-08-14 23:19:32 +10:00
Mads Rasmussen
6c0d14e0f4 add type="button" to toggle so it doesn't auto-submits a form 2018-08-14 13:14:49 +02:00