yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,876 Commits 4 Branches 7 Tags
911fdf20a4ededcaad31abc675356f86adaec985
Commit Graph

18876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shannon
38837049f0 adds invite user endpoint with a controller test! 2017-05-24 19:01:01 +10:00
Mads Rasmussen
1a637961b7 bump avatar font size 2017-05-23 20:57:43 +02:00
Mads Rasmussen
f792be9495 wire up language selector 2017-05-23 15:31:51 +02:00
Mads Rasmussen
41460d5500 rename from role to group 2017-05-23 11:02:52 +02:00
Mads Rasmussen
d56bee8761 Merge branch 'temp-U4-9827' into user-group-permissions 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
 2017-05-23 10:28:59 +02:00
Mads Rasmussen
4c852eab0b fix js error 2017-05-23 10:16:29 +02:00
Shannon
0cca342b83 updates user groups to contain the correct db columns for start nodes, updates mappings, fixes tests. 2017-05-23 15:48:08 +10:00
Shannon
45fa106c42 Adding required user group db columns and models, fixing tests 2017-05-23 15:23:10 +10:00
Shannon
6e9e2b99a4 U4-9944 User table needs to have created/update dates , adds more methods to the user controller for enabling/disabling users 2017-05-23 13:18:29 +10:00
Shannon
1be3f06bc4 Hides the user invite button if there is no email server configured 2017-05-23 12:28:41 +10:00
Shannon
86e4acef86 passes through the user id for the user editor 2017-05-23 12:13:01 +10:00
Mads Rasmussen
b3118f742d increase breadcrumb font size 2017-05-22 14:25:57 +02:00
Mads Rasmussen
83d26fd91a add breadcrumb + back button to editor footer 2017-05-22 14:25:29 +02:00
Shannon
16c6fc70bf updates user resource to use the real endpoint 2017-05-22 21:26:46 +10:00
Shannon
517dc3abe3 updates more user properties 2017-05-22 21:23:04 +10:00
Mads Rasmussen
48432179be rename from user role to user group 2017-05-22 12:14:46 +02:00
Mads Rasmussen
f3d925b509 wire up getPaged getPagedResults for users 2017-05-22 11:31:54 +02:00
Mads Rasmussen
e590b20e75 remove some strokes and borders 2017-05-19 13:12:53 +02:00
Shannon
048112dcea Adds framework for testing our controllers (borrowed from the rest api project) adds a couple easy ones for the user controller 2017-05-19 20:17:50 +10:00
Shannon
fce7adcc8e Merge branch 'dev-v7' into user-group-permissions 2017-05-19 13:21:27 +10:00
Shannon Deminick
c09cd95eb6 Merge pull request #1951 from umbraco/temp-U4-9919 
U4-9919 Updated media files are deleted
 2017-05-19 13:17:35 +10:00
Shannon Deminick
1d3490eb82 Merge pull request #1950 from umbraco/temp-U4-9646 
U4-9646 RTE Link dialog should auto focus on url
 2017-05-19 12:05:05 +10:00
Shannon
b78c334589 Merge remote-tracking branch 'origin/master-v7' into dev-v7 2017-05-19 12:04:27 +10:00
Shannon Deminick
b41de9b623 Merge pull request #1944 from umbraco/temp-U4-9848 
U4-9848 Make sure NuGet version 3.4.4+ is installed in NuGet to prevent update errors
 2017-05-19 12:02:11 +10:00
Shannon Deminick
c51d29da52 Merge pull request #1947 from umbraco/temp-U4-9896 
U4-9896 SqlCEconnection Type A originates from Version=4.0.0.0, Type B originates from 4.0.0.1
 2017-05-19 11:54:40 +10:00
Shannon
73e47402cb Fixes docs build 2017-05-19 10:20:00 +10:00
Shannon
fcc71958e3 Merge remote-tracking branch 'origin/dev-v7' into user-group-permissions 
# Conflicts:
#	.gitignore
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx
 2017-05-19 09:59:59 +10:00
Shannon
bb431c7681 updates ignore 2017-05-19 09:57:53 +10:00
Mads Rasmussen
aeabca87d7 init edit role editor 2017-05-18 15:25:05 +02:00
Mads Rasmussen
fbed82219d init edit user editor 2017-05-18 15:23:38 +02:00
Mads Rasmussen
d57a273c65 Add support for multiple styles on a button component 2017-05-18 13:33:57 +02:00
Mads Rasmussen
d90ef2865b don't use bold for badges 2017-05-18 11:33:37 +02:00
Claus
79844154fb U4-9919 Updated media files are deleted 2017-05-18 11:30:11 +02:00
Claus
067a1ba8e6 U4-9646 RTE Link dialog should auto focus on url 2017-05-18 10:02:46 +02:00
Shannon
29177974eb adds the getPagedResults method to the usersResource 2017-05-18 16:38:14 +10:00
Shannon
b130ccf9c1 removes userResource and adds the disableUser to the usersResource 2017-05-18 15:53:54 +10:00
Shannon
4c61cac9a8 rename to users controller 2017-05-17 22:58:32 +10: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
Shannon
57bd5178f7 Gets proper paging and filtering working for users 2017-05-17 21:40:17 +10:00
Mads Rasmussen
ef51336a7e add text-transform to badge component 2017-05-17 12:12:49 +02:00
Mads Rasmussen
d3dd84671f update mocked user object 2017-05-17 12:11:42 +02:00