Shannon
|
ff6ea0b42e
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310
# Conflicts:
# src/Umbraco.Core/Models/UmbracoObjectTypes.cs
|
2017-02-01 15:23:29 +11:00 |
|
Shannon
|
384a31e3c6
|
Gets member picker working with UDI, ensures that the GUID is indexed for all things - can't believe this wasn't being done, updates the search model mapper to return the UDI
|
2017-02-01 15:19:52 +11:00 |
|
Shannon
|
69b913c608
|
Gets MNTP working with UDI - updates EntityController to support all types of Ids for GetById
|
2017-02-01 14:07:13 +11:00 |
|
Shannon
|
83757c60b5
|
Adds UDI support for the content picker
|
2017-02-01 13:38:42 +11:00 |
|
Morten Christensen
|
fa56f1a59d
|
Merge branch 'dev-v7' into dev-v7.6
|
2017-01-31 12:27:40 +01:00 |
|
Morten Christensen
|
546209ddb5
|
Merge pull request #1716 from umbraco/temp-U4-9451
U4-9451 Package installation custom user control is not displayed aft…
|
2017-01-31 12:24:52 +01:00 |
|
Morten Christensen
|
1e7c44ead0
|
Merge remote-tracking branch 'origin/temp-U4-9451' into dev-v7.6
|
2017-01-31 11:38:41 +01:00 |
|
Warren Buckley
|
6956e01861
|
Merge pull request #1713 from umbraco/temp-U4-9413
U4-9413 moving links to document and media to top of generic properties.
|
2017-01-31 09:37:34 +00:00 |
|
Claus
|
f3b364022a
|
bumping version for deploy.
|
2017-01-31 10:33:57 +01:00 |
|
Claus
|
56ae2b709d
|
adding deploy entity types for forms.
|
2017-01-31 10:31:45 +01:00 |
|
Shannon
|
e95cb14d48
|
Gets FromJsonPath working for EntityController to have GetByIds with all types of Ids for both GET and POST
|
2017-01-31 19:11:05 +11:00 |
|
Shannon
|
54bda6f12a
|
U4-9451 Package installation custom user control is not displayed after a package is installed
|
2017-01-31 15:40:02 +11:00 |
|
Mads Rasmussen
|
0acc202740
|
Merge pull request #1712 from umbraco/temp-U4-9410
U4-9410 Hook up delete dialog for Code Files
|
2017-01-30 20:50:36 +01:00 |
|
Claus
|
74c167ed03
|
U4-9413 moving links to document and media to top of generic properties.
|
2017-01-30 13:18:30 +01:00 |
|
Claus
|
4ad0c1bb89
|
cleaning usings.
|
2017-01-30 13:14:19 +01:00 |
|
Claus
|
67da15330e
|
U4-9410 Hook up delete dialog for Code Files
delete dialogs for partialviews, partialviewmacros and scripts.
+ fixed codefileResource.
+ fixed comments in MemberTypesDeleteController.
|
2017-01-30 11:56:30 +01:00 |
|
Shannon
|
8d598cd37c
|
Gets EntityController working with UDIs, INT and GUID for GetByIds
|
2017-01-30 20:40:45 +11:00 |
|
Sebastiaan Janssen
|
690af8e494
|
Merge pull request #1711 from umbraco/temp-U4-9444
U4-9444 SessionState is not available when rendering macro contents i…
|
2017-01-30 10:00:40 +01:00 |
|
Shannon
|
30c2f95844
|
Merge branch 'refs/heads/dev-v7.6' into temp-U4-9310
|
2017-01-30 16:55:38 +11:00 |
|
Shannon
|
a458e7daf0
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Umbraco.Web.csproj
|
2017-01-30 16:55:12 +11:00 |
|
Shannon
|
0078a5d8cc
|
Getting the media picker wired up for udi
|
2017-01-30 16:54:01 +11:00 |
|
Shannon
|
09085e3bcf
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310
|
2017-01-30 16:52:42 +11:00 |
|
Shannon
|
a31b03b3e2
|
Lazily loads all known UdiType's based on reading through the known constants
|
2017-01-30 15:59:42 +11:00 |
|
Shannon
|
9d06ce53a4
|
U4-9444 SessionState is not available when rendering macro contents in the Rich Text Editor
|
2017-01-30 13:22:47 +11:00 |
|
Stephan
|
d85cb9e15e
|
Fix FileSystemProviderManagerTests
|
2017-01-28 10:04:43 +01:00 |
|
Shannon
|
9ef53536bf
|
Updates the base editor models to include a readonly UDI, updates all model mappers to map the UDI,
|
2017-01-28 01:14:24 +11:00 |
|
Shannon
|
547351a719
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310
|
2017-01-28 00:25:25 +11:00 |
|
Shannon
|
371c4ae1a3
|
Starts creating new UDI picker property editors
|
2017-01-28 00:22:12 +11:00 |
|
Shannon
|
060137c798
|
Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310
|
2017-01-27 23:07:48 +11:00 |
|
Mads Rasmussen
|
19a4cf774b
|
Merge pull request #1680 from umbraco/temp-U4-9352
Implements CodeFileController
|
2017-01-27 10:49:07 +01:00 |
|
Mads Rasmussen
|
ab00ba8a12
|
Merge branch 'dev-v7.6' into temp-U4-9352
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
|
2017-01-27 10:39:31 +01:00 |
|
Claus
|
57e2a19023
|
changing parameter name for IGridCellValueConnector.IsConnector.
|
2017-01-27 10:16:01 +01:00 |
|
Claus
|
daa80a7bf6
|
Merge pull request #1709 from umbraco/temp-U4-9435-2
U4-9435 Fix breaking change made in U4-9312
|
2017-01-27 09:05:47 +01:00 |
|
Shannon
|
8152e7cb92
|
Doh, forgot a file change for tests - fixes build
|
2017-01-27 16:55:29 +11:00 |
|
Shannon Deminick
|
adccb4161e
|
Merge pull request #1707 from umbraco/temp-u4-9438
U4-9438 - fix nasty issue with reading properties in VersionableRepos…
|
2017-01-27 16:52:10 +11:00 |
|
Shannon
|
72a0187295
|
Writes unit test to confirm the correct property data iteration in GetPropertyCollection
|
2017-01-27 16:50:44 +11:00 |
|
Shannon
|
24d6287918
|
Adds string overloads just in case
|
2017-01-27 16:21:01 +11:00 |
|
Shannon
|
55900a3464
|
Updates MediaController and MediaTypeController to have the same method signature supporting both INT and GUID with a custom action selector to handle the ambiguity
|
2017-01-27 16:09:35 +11:00 |
|
Sebastiaan Janssen
|
a5a42854ef
|
Bump version to alpha055
|
2017-01-26 22:02:18 +01:00 |
|
Warren Buckley
|
784c84a166
|
Merge pull request #1474 from umbraco/temp-U4-8963
U4-8963 Updates for ImageProcessor parameters to support background c…
|
2017-01-26 20:45:35 +00:00 |
|
Sebastiaan Janssen
|
f5d78a4d04
|
Merge pull request #1708 from umbraco/temp-U4-9440
Fixes: U4-9440 Update the last few Danish translations for template e…
|
2017-01-26 19:51:54 +01:00 |
|
Mads Rasmussen
|
b334e0ccb2
|
Fixes: U4-9440 Update the last few Danish translations for template editor
|
2017-01-26 19:45:05 +01:00 |
|
Sebastiaan Janssen
|
0a2e5badd0
|
Merge branch 'temp-template-editor' into dev-v7.6
|
2017-01-26 18:27:10 +01:00 |
|
Sebastiaan Janssen
|
90b0bf9d82
|
Merge branch 'dev-v7.6' into temp-template-editor
|
2017-01-26 18:26:32 +01:00 |
|
Sebastiaan Janssen
|
6bcd1e44f9
|
If translation is not done yet, better to leave it English so at least it kind of makes sense
|
2017-01-26 18:24:56 +01:00 |
|
Sebastiaan Janssen
|
36e9bb4d78
|
Merge pull request #1705 from umbraco/temp-v758-recyclebin-fix
Fixes U4-9437
|
2017-01-26 17:31:31 +01:00 |
|
Warren Buckley
|
4c06ead056
|
Merge pull request #1698 from umbraco/temp-U4-9419
fixes: U4-9419 The new content picker adds picked items in a random o…
|
2017-01-26 16:21:03 +00:00 |
|
Sebastiaan Janssen
|
639d04381e
|
Bump version
|
2017-01-26 14:48:19 +01:00 |
|
mikkelhm
|
031340a2ac
|
Adds case for IDictionaryItem when trying to get the Udi from an entity
|
2017-01-26 13:41:04 +01:00 |
|
Warren Buckley
|
2465eb233e
|
Adds in same workaround as other trees like DataTypes & DocTypes where Folders/Containers set an inline piece of JS that does nothing & returns
|
2017-01-26 11:32:13 +00:00 |
|