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
|
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 |
|
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 |
|
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 |
|
Shannon
|
121036ebb9
|
Merge branch 'dev-v7.7' into user-group-permissions
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Umbraco.Web.csproj
|
2017-06-05 10:35:23 +02:00 |
|
Shannon
|
3a990d9cf0
|
Merge remote-tracking branch 'origin/temp-u4-8604-1' into dev-v7.7
|
2017-06-05 09:50:17 +02:00 |
|
Stephan
|
832ee47564
|
Fix nested content prevalue cache of all things
|
2017-06-05 09:28:52 +02:00 |
|
leekelleher
|
dc3f96a292
|
Included a pull-request from NestedContent package
Fixes the prevalue-editor's doctype tabs dropdownlist from reverting to default post-save.
https://github.com/umco/umbraco-nested-content/pull/131
|
2017-06-05 09:28:52 +02:00 |
|
leekelleher
|
7806246a52
|
Added NestedContent to "lists" datatype group.
Set the icon to "icon-thumbnail-list".
|
2017-06-05 09:28:52 +02:00 |
|
leekelleher
|
e136780947
|
Fixed JSLint warnings
Renamed "nestedcontent.filters.js" filename to be singular.
|
2017-06-05 09:28:52 +02:00 |
|
Stephan
|
b9ac5a365a
|
Sanitize editors names
|
2017-06-05 09:28:52 +02:00 |
|
Stephan
|
942d010264
|
Retreat Amazing Nested Content Work
|
2017-06-05 09:28:52 +02:00 |
|
Niels Hartvig
|
1b844421fc
|
Updates to installer to use the new starter kit (and updates core version)
|
2017-06-04 20:47:33 +02:00 |
|
Niels Hartvig
|
df9c6baed7
|
Updates a few numbers in the installer
|
2017-06-04 18:10:29 +02:00 |
|
Sebastiaan Janssen
|
1164f1cdbb
|
Merge branch 'dev-v7' into temp-U4-9980
|
2017-06-04 14:55:03 +02:00 |
|
Niels Hartvig
|
7f05b80a22
|
Make Seb happy
|
2017-06-04 14:02:05 +02:00 |
|
Niels Hartvig
|
20239a9b71
|
Adds a null check to avoid breaking tests (and to comform to coding standards)
|
2017-06-04 14:00:51 +02:00 |
|
Sebastiaan Janssen
|
c4b07cc3ae
|
Merge pull request #1974 from umbraco/temp-U4-9980
Adds support for keys in package content
|
2017-06-03 18:36:28 +02:00 |
|
Sebastiaan Janssen
|
771935b8a5
|
Update PackagingService.cs
|
2017-06-03 18:36:00 +02:00 |
|
Niels Hartvig
|
73bb401f81
|
Updating to TryParse to make Sir Janssen happy :-)
|
2017-06-03 18:34:09 +02:00 |
|
Niels Hartvig
|
8ccbe4c1e4
|
Adds support for keys in package content
|
2017-06-03 17:34:31 +02:00 |
|
Sebastiaan Janssen
|
92f609ff71
|
Merge pull request #1969 from umbraco/temp-U4-9974
U4-9974 EnablePropertyValueConverter does the opposite
|
2017-06-01 13:32:51 +02:00 |
|