yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,111 Commits 4 Branches 7 Tags
25a79bc2fa8b53e6abab682af33410f17febd049
Commit Graph

4762 Commits

Author SHA1 Message Date
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
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
9bf61bb487 real data for user group 2017-06-06 02:05:17 +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
Mads Rasmussen
e8ceb2756d wire up start node preview 2017-06-06 00:49:48 +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
Mads Rasmussen
c03e1420e0 fix user group name 2017-06-06 00:11:59 +02:00
Sebastiaan Janssen
92a507bc87 New CG year 2017-06-05 16:02:04 +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
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
e136780947 Fixed JSLint warnings 
Renamed "nestedcontent.filters.js" filename to be singular.
 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
Marc Goodson
cf3343749f Revert fix to umbrequesthelper.service it was NEVER meant to be able to receive an array of a single dictionary item - actual fix is to change logResource to not pass params in this way 2017-06-02 21:04:12 +01:00
Marc Goodson
079df4a8b7 Pass logType and SinceDate as an array of key value pairs and not an array of a single dictionary - the logapi was never meant to be able to receive a dictionary... see comments on http://issues.umbraco.org/issue/U4-9489 for details 2017-06-02 21:02:46 +01:00
Shannon
5b3c2178a2 Revert "Merge pull request #1729 from marcemarc/marcemarc-U4-9480" 
This reverts commit 145f789631, reversing
changes made to 78bc38fe1b.
 2017-05-31 15:26:22 +02:00
Shannon Deminick
145f789631 Merge pull request #1729 from marcemarc/marcemarc-U4-9480 
U4-9489 - dictonaryToQueryString only returns first dictionary item
 2017-05-31 15:17:11 +02:00
Mads Rasmussen
f3763dffe5 prototype user picker 2017-05-30 17:04:41 +02:00
Mads Rasmussen
be939b48f9 wire up users pagination 2017-05-30 11:57:41 +02:00
Mads Rasmussen
b678eff484 wire up user state badges + create user confirmation 2017-05-30 11:31:43 +02:00
Mads Rasmussen
01ff16d00d add border to sidebar group 2017-05-30 10:12:44 +02:00
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
Claus
4a735770e2 Merge pull request #1961 from umbraco/temp-U4-9937 
fixes: U4-9937 RTE Media Picker - Cannot add image to RTE after searching
 2017-05-29 11:42:05 +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
Bjarne Fyrstenborg
5a4e6df99c Merge remote-tracking branch 'upstream/dev-v7' into dev-v7-U4-9571 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/tree.less
 2017-05-24 09:40:14 +02:00
Bjarne Fyrstenborg
22f8a4c5dd Fix overwriting background repeat and position on legacy tree icons 2017-05-24 09:24:26 +02:00
Mads Rasmussen
1a637961b7 bump avatar font size 2017-05-23 20:57:43 +02:00