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

4692 Commits

Author SHA1 Message Date
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
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
Mads Rasmussen
f792be9495 wire up language selector 2017-05-23 15:31:51 +02:00
Mads Rasmussen
dc5089a9d6 fix svg preview 2017-05-23 14:38:52 +02:00
Mads Rasmussen
45a246d8b6 handle entity and full media objects in media grid 2017-05-23 14:38:34 +02:00
Mads Rasmussen
65bcd78872 add helper to get file extension 2017-05-23 14:37:51 +02:00
Mads Rasmussen
a0fd7001e9 fixes image select in details overlay 2017-05-23 14:37:26 +02:00
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
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
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
Sebastiaan Janssen
cf7c0dffb0 Merge branch 'u4-9558' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9558 2017-05-20 11:48:47 +02:00
Mads Rasmussen
e590b20e75 remove some strokes and borders 2017-05-19 13:12:53 +02:00
Shannon
fce7adcc8e Merge branch 'dev-v7' into user-group-permissions 2017-05-19 13:21:27 +10:00