Commit Graph

20127 Commits

Author SHA1 Message Date
Stephan
a50256d381 Enable trying to convert urls to ascii 2017-06-01 17:58:22 +02:00
Stephan
290f34f034 FileSystemTreeController compatibility 2017-06-01 17:24:10 +02:00
Sebastiaan Janssen
92f609ff71 Merge pull request #1969 from umbraco/temp-U4-9974
U4-9974 EnablePropertyValueConverter does the opposite
2017-06-01 13:32:51 +02:00
Sebastiaan Janssen
7e6f7f8a2b Bumps version 2017-06-01 13:04:31 +02:00
Claus
c5419e700b the legacy converter should not be associated to RelatedLinks2Alias and should only be enabled if EnablePropertyValueConverters is false, otherwise the other converter should be used. 2017-06-01 13:03:56 +02:00
Sebastiaan Janssen
cb09094632 U4-9974 EnablePropertyValueConverter does the opposite 2017-06-01 10:57:15 +02:00
Shannon
618c50f9da Ability to add/remove/replace an ISearchableTree 2017-05-31 22:52:16 +02:00
Sebastiaan Janssen
72404e68a0 Merge pull request #1968 from umbraco/temp-u4-9927
U4-9927 - fix migration
2017-05-31 16:36:42 +02:00
Sebastiaan Janssen
2c451c5cfe Remove debug tracing 2017-05-31 16:29:26 +02:00
Stephan
af7f83f0f6 U4-9927 - fix migration 2017-05-31 15:49:15 +02:00
Shannon
5b3c2178a2 Revert "Merge pull request #1729 from marcemarc/marcemarc-U4-9480"
This reverts commit 145f789631, reversing
changes made to 78bc38fe1b.
2017-05-31 15:26:22 +02:00
Shannon Deminick
145f789631 Merge pull request #1729 from marcemarc/marcemarc-U4-9480
U4-9489 - dictonaryToQueryString only returns first dictionary item
2017-05-31 15:17:11 +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
Sebastiaan Janssen
e27e95cb1a U4-9952 Can not save XSLT files in 7.6 2017-05-31 11:11:56 +02:00
Mikkel Holck Madsen
cdbc3fa8cd Merge pull request #1967 from umbraco/temp-U4-9971
U4-9971 Special "square bracket" notation in Umbraco.Field not working
2017-05-31 10:55:17 +02:00
Sebastiaan Janssen
6feb7b222f U4-9971 Special "square bracket" notation in Umbraco.Field not working 2017-05-31 10:18:10 +02:00
Mads Rasmussen
f3763dffe5 prototype user picker 2017-05-30 17:04:41 +02:00
Mads Rasmussen
be939b48f9 wire up users pagination 2017-05-30 11:57:41 +02:00
Mads Rasmussen
b678eff484 wire up user state badges + create user confirmation 2017-05-30 11:31:43 +02:00
Mads Rasmussen
01ff16d00d add border to sidebar group 2017-05-30 10:12:44 +02:00
Mads Rasmussen
a50f1e22c0 add progress bar to user avatar upload 2017-05-30 10:12:16 +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
06aaa9718f fixes test 2017-05-29 17:25:44 +02:00
Shannon
d3eeb45651 ensures the message is added to the email 2017-05-29 15:57:59 +02:00
Shannon
6cd52bbc3c Gets user invite generating the token, sending the email and then verifying the token 2017-05-29 15:55:36 +02:00
Shannon
273c934e26 wires up the invite user to the rest endpoint 2017-05-29 15:13:04 +02:00
mikkelhm
b0a739b4ac Bump version to 7.6.2 2017-05-29 15:07:37 +02:00
Sebastiaan Janssen
728dee070f Merge pull request #1965 from umbraco/temp-U4-9894-2
U4-9894 UDI Pickers and all 'v2' property editors shouldn't observe t…
2017-05-29 14:27:18 +02:00
Shannon
2087125d95 Fixes an issue with model mappings and group assignments 2017-05-29 14:16:48 +02:00
Claus
4a735770e2 Merge pull request #1961 from umbraco/temp-U4-9937
fixes: U4-9937 RTE Media Picker - Cannot add image to RTE after searching
2017-05-29 11:42:05 +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
Shannon
7f27745d27 starting to get the invite email with token working 2017-05-29 09:36:07 +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
mikkelhm
39851d2475 Ignoring the StringEncodingTest2 as AppVeyors framework settings is doing weird things, that makes it fail 2017-05-26 13:31:29 +02:00
Mikkel Holck Madsen
28adbc17ef Merge pull request #1963 from umbraco/temp-deploy-324
deploy-324 - fix udi encoding
2017-05-26 13:14:29 +02:00
Shannon
f493c254e8 Fixes up the users login date on the user list view, fixes tests 2017-05-26 12:47:31 +10:00
Shannon
362b98509b Updates path check to use all assigned user start nodes that are combined by their groups and directly assigned values 2017-05-26 12:09:06 +10:00
Shannon
4337036358 refactor users and how groups are added to them so we can know dynamically start nodes, etc... fixes tests 2017-05-26 11:17:06 +10:00
Shannon
271c771f1c fixing tests 2017-05-26 09:50:51 +10:00
Mads Rasmussen
7934ea14a3 wire up enable and disable user 2017-05-25 22:09:52 +02:00
Shannon
8aabb3e3d0 wires up custom user avatars 2017-05-26 02:15:37 +10:00
Shannon
528be48437 Adds UsersController.SetAvatar and ClearAvatar 2017-05-26 00:02:32 +10: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
39da34e1c7 Attempt to force .NET 4.5 for tests 2017-05-25 13:14:56 +02:00
Sebastiaan Janssen
55dc927c8b Does this help get the StringEncodingTest2 to run? Doubt it. 2017-05-25 12:07:20 +02:00
Sebastiaan Janssen
6e3ff59dfb Adds GetIdForUdi to UmbracoHelper 2017-05-25 11:04:40 +02:00
Sebastiaan Janssen
08eab00627 Adds GetIdForUdi method to IEntityService 2017-05-25 10:48:28 +02:00
Sebastiaan Janssen
c4fae9b272 Remove extension method 2017-05-25 10:47:15 +02:00