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

16190 Commits

Author SHA1 Message Date
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
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
Shannon
a8220e0f62 gets user saving working 2017-05-25 12:17:32 +10:00
Mads Rasmussen
cb097f11a1 add save user and create user 2017-05-25 00:13:11 +02:00
Mads Rasmussen
911fdf20a4 add watcher to avatar name 2017-05-24 22:53:25 +02:00
Mads Rasmussen
939d128662 fix load indicator on user 2017-05-24 22:43:51 +02:00
Mads Rasmussen
b95ba2e9a7 wire up user group picker 2017-05-24 22:36:44 +02:00
Mads Rasmussen
e9c917e60b add resource for getUserGroups 2017-05-24 22:35:47 +02:00
Shannon
2cd23cb24f Updates business logic to persist the start nodes for users 2017-05-25 02:46:21 +10:00
Shannon
59872b0e17 fixes ability to create new users with the legacy editor 2017-05-25 02:11:38 +10:00
Shannon
6e9ae485ea Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-05-25 02:03:58 +10:00
Shannon
dec9422531 Updated DB and business logic to support multiple starts nodes for a user and for user groups to have start nodes - U4-9915 User Groups will have a start node assigned and Users can have multiple start nodes assigned 2017-05-25 02:03:41 +10:00
Mads Rasmussen
633bd847ea Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions 2017-05-24 11:32:55 +02:00
Stephan
51186bea24 deploy-324 - fix udi encoding 2017-05-24 11:20:01 +02:00
Shannon
38837049f0 adds invite user endpoint with a controller test! 2017-05-24 19:01:01 +10:00
Bjarne Fyrstenborg
5a4e6df99c Merge remote-tracking branch 'upstream/dev-v7' into dev-v7-U4-9571 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/tree.less
 2017-05-24 09:40:14 +02:00
Bjarne Fyrstenborg
22f8a4c5dd Fix overwriting background repeat and position on legacy tree icons 2017-05-24 09:24:26 +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
Mads Rasmussen
1a637961b7 bump avatar font size 2017-05-23 20:57:43 +02:00