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

4666 Commits

Author SHA1 Message Date
Mads Rasmussen
a50f1e22c0 add progress bar to user avatar upload 2017-05-30 10:12:16 +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
Shannon
f493c254e8 Fixes up the users login date on the user list view, fixes tests 2017-05-26 12:47:31 +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
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
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
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
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
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
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
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
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
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
Mads Rasmussen
5e3e9cce12 add setting for button sizes + allow icon on buttons 2017-05-17 12:10:50 +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
Mads Rasmussen
c299edfe5a U4-9901 User role picker should show permission details 2017-05-16 15:08:49 +02:00
Mads Rasmussen
73d7915fb5 fixes: U4-9900 Add support for selecting an editor sub view trough route params 2017-05-16 13:14:29 +02:00
Shannon
bb436426a4 Merge remote-tracking branch 'origin/temp-U4-9776' into temp-U4-8632 
# Conflicts:
#	src/Umbraco.Web.UI/config/trees.config
 2017-05-16 15:19:45 +10:00
Claus
d146df43e6 Merge pull request #1903 from HarveyWilliams/dev-v7 
U4-9806 Media Picker media hover should show full title
 2017-05-15 10:19:04 +02:00
Mads Rasmussen
0e8b8e3aef set up some simple filtering of actions based on selection 2017-05-11 13:45:18 +02:00
Mads Rasmussen
7cf3f10afb missed two paths 2017-05-11 13:44:35 +02:00
Mads Rasmussen
6a4a84d8aa update files to match new tree path 2017-05-11 10:25:57 +02:00