Shannon
618c50f9da
Ability to add/remove/replace an ISearchableTree
2017-05-31 22:52:16 +02:00
Shannon
106a06be2a
Gets templates working
2017-05-31 13:09:26 +02:00
Shannon
a70c9226fc
Updates lots of trees for searching and gets results grouped
2017-05-31 12:25:05 +02:00
Shannon
3ae16e717c
Merge branch 'dev-v7-pluggable-ISearchableTree' of https://github.com/efabioli/Umbraco-CMS into efabioli-dev-v7-pluggable-ISearchableTree
...
# Conflicts:
# src/Umbraco.Web/Editors/EntityController.cs
# src/Umbraco.Web/Models/ContentEditing/EntityBasic.cs
2017-05-30 00:48:41 +02:00
Shannon
d54b3a0cc3
U4-9894 UDI Pickers and all 'v2' property editors shouldn't observe the EnablePropertyValueConverters setting
2017-05-29 09:38:16 +02:00
Claus
f962a3db20
Merge pull request #1953 from umbraco/temp-U4-9935
...
U4-9935 UmbracoHelper doesn't have querying methods for handling UDI
2017-05-29 09:34:29 +02:00
Shannon Deminick
4b9a13078e
Merge pull request #1957 from umbraco/temp-U4-9940
...
U4-9940 Make it easy to get the integer Id of an item from it's Udi
2017-05-25 23:58:23 +10:00
Sebastiaan Janssen
17cce9a666
Make EntityService private
2017-05-25 15:40:26 +02:00
Sebastiaan Janssen
6e3ff59dfb
Adds GetIdForUdi to UmbracoHelper
2017-05-25 11:04:40 +02:00
Sebastiaan Janssen
c4fae9b272
Remove extension method
2017-05-25 10:47:15 +02:00
Shannon Deminick
aaf7ae0331
Merge pull request #1960 from umbraco/temp-u4-9936
...
U4-9936 - fix xml cache refresh in lb
2017-05-24 16:15:03 +10:00
Shannon Deminick
8459a058c6
Merge pull request #1956 from umbraco/temp-U4-9898
...
U4-9898 Reset password should unlock a locked account
2017-05-24 15:36:33 +10:00
Stephan
09ceb15d08
U4-9936 - fix xml cache refresh
2017-05-23 14:19:32 +02:00
Stephan
63d8ef7560
U4-9936 - fix xml cache refresh in lb
2017-05-23 11:21:18 +02:00
Sebastiaan Janssen
b9c418e458
Fix updating the actual lockout
2017-05-22 08:36:02 +02:00
Sebastiaan Janssen
c843e634ba
Merge pull request #1954 from aburok/dev-v7.6-ScheduledPublishing_RequestLogging
...
add log if request to ScheduledPublishController fails without exception
2017-05-21 13:40:29 +02:00
Sebastiaan Janssen
8eb0d254da
U4-9940 Make it easy to get the integer Id of an item from it's Udi
2017-05-21 13:35:29 +02:00
dkoruba
ac8ee92bb8
fix typo
2017-05-20 20:55:40 +02:00
Sebastiaan Janssen
aee06c4574
U4-9898 Reset password should unlock a locked account
2017-05-20 14:33:33 +02:00
Sebastiaan Janssen
cf7c0dffb0
Merge branch 'u4-9558' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9558
2017-05-20 11:48:47 +02:00
Sebastiaan Janssen
22d778ed28
Adds UDI redirect for FollowExternalRedirect
...
Checks if the redirect property exists before trying to get it's value
Simplified conversions by asking for the property value by type
2017-05-20 11:34:03 +02:00
Sebastiaan Janssen
a3a2b6499e
Merge branch 'U4-9872' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-9872
2017-05-20 09:49:12 +02:00
dkoruba
65ed69cf06
add log if request to ScheduledPublishController fails without exception
2017-05-19 22:14:10 +02:00
Shannon
54967e0150
U4-9935 UmbracoHelper doesn't have querying methods for handling UDI
2017-05-19 11:42:58 +10:00
Claus
79844154fb
U4-9919 Updated media files are deleted
2017-05-18 11:30:11 +02:00
Warren Buckley
120cb964a5
Merge pull request #1949 from umbraco/temp-u4-9926
...
U4-9926 - fix partial view macro udis
2017-05-17 13:39:48 +01:00
Stephan
147a1daf6d
U4-9926 - fix partial view macro udis
2017-05-17 12:09:28 +02:00
Shannon
765decf3b1
Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7
...
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
# src/Umbraco.Web/Trees/PartialViewsTree.cs
2017-05-17 20:00:29 +10:00
James Coxhead
451826a329
Fixes umbracoInternalRedirectId property to work with UDI IDs
2017-05-14 21:52:45 +01:00
wanddy
c6bc5ae6aa
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2017-05-10 22:37:47 +08:00
Shannon Deminick
f84d3b435b
Merge pull request #1898 from DaveLong/U4-9799
...
Fixed Serialization issue in ValidatePasswordResetCodeModel
2017-05-10 14:59:04 +10:00
AndyButland
712cd29fea
Upload checks to utilise whitelist. Refactored check on white and black list to common extension method.
2017-05-09 23:29:30 +02:00
AndyButland
3d21448f89
Validated file uploads using white list if provided, before falling back to blacklist
2017-05-09 18:12:51 +02:00
suedeapple
8c6362d947
automaticly - > automatically
2017-05-09 16:40:59 +01:00
Mikkel Holck Madsen
a2df4c5232
Merge pull request #1933 from umbraco/temp-U4-9864
...
U4-9864 Missing import and xss check in other PermissionEditor.aspx
2017-05-08 10:29:03 +02:00
Claus
3c4b3f44c7
U4-9864 Missing import and xss check in other PermissionEditor.aspx
2017-05-05 14:52:01 +02:00
Claus
e7eaf6959f
U4-9849 Query Builder not working in template editor. Always returns Model.Content.Site().Children()
...
adding missing nullchecks in the endpoint action.
ensuring promise returns before setting init data - the unresolved promise was being used on the query model instead of the actual text string the promise returns - causing the endpoint to fail to bind the model.
2017-05-04 15:08:37 +02:00
wanddy
b807b84466
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2017-05-02 14:23:36 +08:00
wanddy
ab551b2c96
Fix some menu tree header won't be translated.
...
This may be caused by the explicit definition of tree node name.
Signed-off-by: wanddy <wanddy@163.com >
2017-05-02 14:20:44 +08:00
Shannon
31c965ae42
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
2017-05-02 13:41:03 +10:00
Shannon Deminick
d91fc6ce60
Merge pull request #1887 from umbraco/temp-U4-9775
...
U4-9775 AlreadyClosedException is thrown when retrieving media if the…
2017-05-02 13:40:28 +10:00
Shannon
d5124e9739
Ensures that an UmbracoContext exist before emitting the cache handler events
2017-05-01 21:10:22 +10:00
Shannon
2479c5a272
updates other nuget refs that shouldnt be there
2017-04-30 23:21:19 +10:00
Shannon
004e00599d
Fixing nuget package issues , semver 2 is only for 452+ which we dont have, we shouldnt be using it and it adds more dependencies that we don't need right now
2017-04-30 23:19:45 +10:00
Shannon Deminick
3509a2c40f
Merge pull request #1908 from umbraco/temp-scope-events-stale-entities
...
POC to normalize all event entities when we track events so that all …
2017-04-30 19:28:19 +10:00
Shannon Deminick
cf8ead62ac
Merge pull request #1904 from jwoods1/patch-2
...
Fixed issue on line 216
2017-04-30 17:11:44 +10:00
Stephan
72eddca3c6
Merge branch 'dev-v7.6' into temp-scope-events-stale-entities
2017-04-28 19:19:36 +02:00
Stephan
244977dc95
packages - trace errors
2017-04-28 13:34:35 +02:00
Shannon
ec9020f63e
Fixes mappings
2017-04-28 13:34:32 +10:00
Shannon
d24b0aa9eb
oops undeletes a couple files that are still needed for the custom package ascx page
2017-04-28 10:30:47 +10:00
