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

16003 Commits

Author SHA1 Message Date
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 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
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
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
Mads Rasmussen
5e3e9cce12 add setting for button sizes + allow icon on buttons 2017-05-17 12:10:50 +02:00
Stephan
147a1daf6d U4-9926 - fix partial view macro udis 2017-05-17 12:09:28 +02:00
Shannon
9badb35c05 fix merge issue 2017-05-17 20:08:53 +10: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
Shannon
9bb880f195 Starts getting the user service/repo to do paging filtering nicely 2017-05-17 19:47:16 +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
225f657154 fixes tests for mappings 2017-05-16 18:18:10 +10:00
Shannon
4f80902ac2 Fixes unit tests - all but one 2017-05-16 17:17:02 +10:00
mikkelhm
69775c369a Bump version to 7.5.14 2017-05-16 08:33:19 +02:00
Shannon
26b8236eea fixes user query relator 2017-05-16 16:09:01 +10:00
Shannon
ffd63a9103 fixes merge issues 2017-05-16 15:51:30 +10: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
Sebastiaan Janssen
99d4b13bb0 Adds SQLCE assembly redirect on fresh installs and upgrades 2017-05-15 22:54:46 +02:00
Shannon
faa6a229e6 Updates UserGroupRepository to ensure that it persists things int he correct order and inside of a transaction, removes new code that is already obsolete, fixes tests 2017-05-15 20:27:40 +10:00
Claus
5dc3e0a3fc Merge pull request #1880 from marcemarc/temp-U4-9765 
debug logging when there is a distributed calls config issue
 2017-05-15 10:28:26 +02:00