Shannon
|
6d22f7f86f
|
Getting the invite password setting done with validation, almost there
|
2017-06-15 00:05:12 +02:00 |
|
Shannon
|
c13b2fae4b
|
Fixes issue of rendering the umb version in the html markup
|
2017-06-15 00:04:42 +02:00 |
|
Shannon
|
51b19bedc8
|
Merge remote-tracking branch 'origin/dev-v7' into user-group-permissions
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Editors/GravatarController.cs
# src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
|
2017-06-14 22:30:36 +02:00 |
|
Shannon
|
582e36c517
|
Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions
|
2017-06-14 21:30:08 +02:00 |
|
Shannon
|
a62426a763
|
Gets email sending ensures user is logged in with verifying but is only partially logged in and cannot access the back office, they can only access the verification screen
|
2017-06-14 16:21:56 +02:00 |
|
Mads Rasmussen
|
898f00cbf1
|
fix avatar sizes
|
2017-06-14 14:07:07 +02:00 |
|
Mads Rasmussen
|
12de575dfb
|
update user picker to match new data model
|
2017-06-14 13:12:49 +02:00 |
|
Mads Rasmussen
|
cd8418a8c0
|
remove fake loading of user groups
|
2017-06-14 12:52:12 +02:00 |
|
Mads Rasmussen
|
89dcb6a0e2
|
fix start node pickers
|
2017-06-14 12:51:41 +02:00 |
|
Shannon
|
cd1e88d151
|
Gets email sending using razor view
|
2017-06-14 11:29:15 +02:00 |
|
Mikkel Holck Madsen
|
c0616a37bf
|
Merge pull request #1999 from umbraco/temp-tryAscii
Enable trying to convert urls to ascii
|
2017-06-14 10:12:58 +02:00 |
|
Mikkel Holck Madsen
|
da4be3be65
|
Merge pull request #1995 from umbraco/temp-backofficeguids
Adds hoverstates for metadata(documenttypes, datatypes etc), making it possible to see their guids in the backoffice
|
2017-06-14 08:27:41 +02:00 |
|
Shannon
|
e757868d09
|
Moves logic back to user service for inviting a user since its much simpler.
|
2017-06-13 18:47:20 +02:00 |
|
Shannon
|
f09f17e496
|
getting email invite working and with identity apis
|
2017-06-13 18:38:16 +02:00 |
|
Shannon
|
3fac1b05ae
|
Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions
|
2017-06-13 15:48:04 +02:00 |
|
Shannon
|
716629235e
|
issue with mapping ysod
|
2017-06-13 15:47:39 +02:00 |
|
Mads Rasmussen
|
e40a904896
|
clean up groups overview controller
|
2017-06-13 15:39:14 +02:00 |
|
Mads Rasmussen
|
5aeb8ed74d
|
get all sections in section picker
|
2017-06-13 15:27:58 +02:00 |
|
Mads Rasmussen
|
5273644a7e
|
split up groups and status filter + add additional filter options to order by
|
2017-06-13 15:12:54 +02:00 |
|
Shannon Deminick
|
08c4a75af7
|
Merge pull request #1945 from protherj/U4-9792-fips-support
U4-9792 -- Update Umbraco to be FIPS compliant
|
2017-06-13 15:05:21 +02:00 |
|
Mads Rasmussen
|
56e6722880
|
fix user group load spinner
|
2017-06-13 11:47:35 +02:00 |
|
Mads Rasmussen
|
fb3ac86d8c
|
add section picker
|
2017-06-13 11:30:48 +02:00 |
|
Jason Prothero
|
e99309aa2f
|
Merge pull request #3 from protherj/fips-refactoring
Added RFC 4122 compliant GUID support to StrringExtensions ToGuid()
|
2017-06-12 13:47:26 -07:00 |
|
Jason Prothero
|
917a2b78dd
|
Added RFC 4122 compliant GUID support to the ToGuid() method on StrringExtensions.cs. Verified the SHA1 hash works with the ToGuid() method via unit tests.
|
2017-06-12 13:44:42 -07:00 |
|
Mads Rasmussen
|
e559a6d485
|
add key as hover on name
|
2017-06-12 14:55:12 +02:00 |
|
Claus
|
160518e977
|
adding guids to backoffice.
|
2017-06-12 12:12:14 +02:00 |
|
Mads Rasmussen
|
379b8c3719
|
fix render in users list view
|
2017-06-06 02:16:21 +02:00 |
|
Shannon
|
174e336512
|
fixes sections
|
2017-06-06 02:13:14 +02:00 |
|
Shannon
|
9bf61bb487
|
real data for user group
|
2017-06-06 02:05:17 +02:00 |
|
Shannon
|
5a5bdb6328
|
user doesn't need to be not approved for invite
|
2017-06-06 01:29:01 +02:00 |
|
Shannon
|
7f03a97a78
|
Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions
|
2017-06-06 01:21:17 +02:00 |
|
Shannon
|
7533b0e704
|
ensures icons, ensures saving info for creating users
|
2017-06-06 01:21:03 +02:00 |
|
Mads Rasmussen
|
d72af87790
|
rename content picker to media picker
|
2017-06-06 01:11:40 +02:00 |
|
Mads Rasmussen
|
1eba16579a
|
remove search on user groups
|
2017-06-06 01:10:55 +02:00 |
|
Mads Rasmussen
|
1c373ca771
|
fix render in user group picker
|
2017-06-06 01:10:36 +02:00 |
|
Shannon
|
f907385ac8
|
fix mapping issue
|
2017-06-06 01:06:19 +02:00 |
|
Shannon
|
fbda8fe4a3
|
Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions
|
2017-06-06 00:50:56 +02:00 |
|
Mads Rasmussen
|
e8ceb2756d
|
wire up start node preview
|
2017-06-06 00:49:48 +02:00 |
|
Shannon
|
cfe90999d3
|
Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions
|
2017-06-06 00:49:43 +02:00 |
|
Shannon
|
bbda93a06b
|
updates mapping for start nodes
|
2017-06-06 00:49:36 +02:00 |
|
Mads Rasmussen
|
a041fc47e0
|
view for user group preview
|
2017-06-06 00:49:07 +02:00 |
|
Mads Rasmussen
|
6da5fe6b3a
|
fix sections, content and media start node in umbUserGroupPreview
|
2017-06-06 00:35:31 +02:00 |
|
Shannon
|
869f75af4a
|
Merge branch 'user-group-permissions' of https://github.com/umbraco/Umbraco-CMS into user-group-permissions
|
2017-06-06 00:14:26 +02:00 |
|
Shannon
|
76032cf5f7
|
maps name and icon for user groups
|
2017-06-06 00:13:46 +02:00 |
|
Mads Rasmussen
|
c03e1420e0
|
fix user group name
|
2017-06-06 00:11:59 +02:00 |
|
Shannon
|
64975166e7
|
updates user models
|
2017-06-06 00:02:23 +02:00 |
|
Shannon
|
2ee34d5c48
|
updates user models
|
2017-06-05 23:25:33 +02:00 |
|
Jeavon Leopold
|
5eb330b7d7
|
Add GetAbsoluteMediaUrl method to UrlHelper for the Open Graph starter kit lesson
|
2017-06-05 17:32:05 +02:00 |
|
Sebastiaan Janssen
|
2191d33844
|
Bumps version
|
2017-06-05 16:33:47 +02:00 |
|
Sebastiaan Janssen
|
92a507bc87
|
New CG year
|
2017-06-05 16:02:04 +02:00 |
|