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 |
|
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 |
|
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 |
|
mikkelhm
|
3f25d3637a
|
Bump version to 7.5.14
|
2017-05-16 08:32:33 +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 |
|
Sebastiaan Janssen
|
e7b007386a
|
U4-9848 Make sure NuGet version 3.4.4+ is installed in NuGet to prevent update errors
|
2017-05-15 19:00:05 +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 |
|
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 |
|
Shannon
|
9b50d6d251
|
Gets a few tests fixed
|
2017-05-11 20:51:31 +10:00 |
|
Mads Rasmussen
|
6a4a84d8aa
|
update files to match new tree path
|
2017-05-11 10:25:57 +02:00 |
|
Mads Rasmussen
|
89c4f7dffd
|
Merge branch 'temp-U4-9776' of https://github.com/umbraco/Umbraco-CMS into temp-U4-9776
|
2017-05-11 09:54:34 +02:00 |
|
Mads Rasmussen
|
4e76b61251
|
rename section
|
2017-05-11 09:53:43 +02:00 |
|
Mads Rasmussen
|
03cce6e8f6
|
move badge + add title
|
2017-05-11 09:53:19 +02:00 |
|
Mads Rasmussen
|
956250004e
|
add go back button to edit user
|
2017-05-11 09:48:16 +02:00 |
|
Mads Rasmussen
|
536be45bbf
|
add go back button to edit role
|
2017-05-11 09:47:35 +02:00 |
|
Mads Rasmussen
|
e5240575bd
|
add bulk selection to user roles
|
2017-05-11 09:31:58 +02:00 |
|
Shannon
|
84c7f5046e
|
Fixes the user group queries to be sorted since the relator requires this
|
2017-05-11 15:15:46 +10:00 |
|
Shannon
|
d2d6b6654a
|
Adds models and methods for the UserController
|
2017-05-11 13:11:41 +10:00 |
|