yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,005 Commits 4 Branches 7 Tags
39c19dc1d43a4134148d12f68989b6f3ddb3b66f
Commit Graph

20005 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zsolt
39c19dc1d4 Merge remote-tracking branch 'origin/temp-U4-10309' into temp-U4-10309 2017-08-31 12:52:30 +02:00
Zsolt
7b4b6357cb changed more <h> tags + realigned them 2017-08-31 12:47:01 +02:00
Mads Rasmussen
4454290820 make link to document block element, add hover state + open in new tab 2017-08-31 11:56:03 +02:00
Mads Rasmussen
d94cd9dc8d Merge branch 'temp-U4-10309' of https://github.com/umbraco/Umbraco-CMS into temp-U4-10309 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
 2017-08-31 11:34:25 +02:00
Mads Rasmussen
8c07af9505 fake loading the auditTrail 2017-08-31 11:31:41 +02:00
Zsolt
d32fb44187 Merge remote-tracking branch 'origin/temp-U4-10309' into temp-U4-10309 2017-08-31 11:29:08 +02:00
Zsolt
dd38480ce2 changing <h> tags to span + adding extra description to timeline 2017-08-31 11:29:03 +02:00
Mads Rasmussen
08e8e3918e make template selector work 2017-08-31 11:23:10 +02:00
Zsolt
7a3591d1bd last line of the timeline is not there anymore 2017-08-31 10:20:49 +02:00
Zsolt
59ab7f5c8d Changed the order of meta data 2017-08-31 10:01:36 +02:00
Zsolt
c2b2182182 Merge remote-tracking branch 'origin/temp-U4-10309' into temp-U4-10309 2017-08-31 09:51:54 +02:00
Zsolt
66b656f058 added the icon to the link, also the link functions as a link 2017-08-31 09:51:20 +02:00
Mads Rasmussen
c8f7ecabf4 add avatar + set correct color on badges for history 2017-08-30 20:32:40 +02:00
Zsolt
9137249510 properties tab UI prototype with dummy data 2017-08-30 16:42:20 +02:00
Sebastiaan Janssen
7197c9cbb4 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Models/UserExtensions.cs
 2017-08-25 16:39:06 +02:00
Sebastiaan Janssen
b9614f9393 Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7 2017-08-25 16:22:26 +02:00
Sebastiaan Janssen
9917fb20ca U4-10356 Update default Config/Lang after each update 
Also makes sure UserExtensions returns the correct language
 2017-08-25 16:13:04 +02:00
Shannon
9b327dd27e Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-08-25 09:54:36 +10:00
Shannon Deminick
21ed9989f3 Merge pull request #2139 from umbraco/temp-U4-2449 
U4-2449 Feature request: Change the default admin users lang to en-us
 2017-08-25 09:40:05 +10:00
Sebastiaan Janssen
780776072d Update umbracoDefaultUILanguage to en-US 2017-08-24 21:03:31 +02:00
Sebastiaan Janssen
49bf7e43a4 Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7 2017-08-24 20:58:56 +02:00
Sebastiaan Janssen
db63e70a99 Merge pull request #2141 from umbraco/temp-U4-10258 
U4-10258 Add documentation for umbUserGroupPreview component
 2017-08-24 20:10:56 +02:00
Sebastiaan Janssen
5ed4d9ccae Merge pull request #2117 from umbraco/temp-U4-10201 
U4-10201 Exception when deleting a user's start node - adds FKs, fixe…
 2017-08-24 20:04:44 +02:00
Shannon
e71e9d7efb U4-10249 FolderAndFilePermissions HealthCheck causes the application to restart 
(cherry picked from commit bdb991f6dc)
 2017-08-24 18:51:53 +02:00
Sebastiaan Janssen
6eb4c066c6 Merge pull request #2136 from umbraco/temp-U4-10249 
U4-10249 FolderAndFilePermissions HealthCheck causes the application …
 2017-08-24 18:49:29 +02:00
Shannon Deminick
3c17e30133 Merge pull request #2144 from umbraco/temp-U4-10348 
U4-10348 Show readonly user profile information on user editor
 2017-08-24 20:03:01 +10:00
Shannon
ee6dbcef17 minor copy updates, removes test json 2017-08-24 20:02:41 +10:00
Shannon
1b369b5ba9 Adds back a backwards compatibility API 2017-08-24 19:45:48 +10:00
Shannon
7636f54ffd Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Tests/Umbraco.Tests.csproj
 2017-08-24 19:07:21 +10:00
Mads Rasmussen
ff45f1f9cc show calculated start nodes on the user profile 2017-08-23 15:21:19 +02:00
Mads Rasmussen
f50898ee6d add description to umb-box component 2017-08-23 15:20:23 +02:00
Mads Rasmussen
6796f4d4f5 U4-10348 Show readonly user profile information on user editor 2017-08-23 13:08:25 +02:00
Shannon
a0785f2e0d backports U4-10349 Optimize EnsureUniqueNodeName 2017-08-23 16:22:01 +10:00
Shannon Deminick
1abbc31348 Merge pull request #2145 from umbraco/temp-deploy-367 
Improve EnsureUniqueNodeName perfs?
 2017-08-23 16:18:47 +10:00
Shannon
f48ffd28c0 reverts files that shouldn't have been committed 2017-08-23 15:59:47 +10:00
Shannon
c5e1fc5a20 U4-10348 Show readonly user profile information on user editor 2017-08-23 15:45:42 +10:00
Shannon
04ac744277 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 2017-08-23 15:23:04 +10:00
Shannon
f457edfada fixes tests 2017-08-23 15:20:12 +10:00
Shannon
8982f7b933 U4-10346 Whenever you visit either the users or the groups section BOTH controllers: Users and Groups initialize 2017-08-23 15:10:10 +10:00
Shannon
9261f46ad1 fixes various report issues with new security policies 2017-08-23 14:56:42 +10:00
Shannon
3106c22287 UAASSCRUM-1045 Umbraco 7.7: New sites created have an "Administrator” user visible in the back office. 2017-08-22 17:55:28 +10:00
Shannon
98bd044823 Updates logic so that non-admins cannot see any admins in the user editor 2017-08-22 17:27:16 +10:00
Shannon
5afe16ae0e Updates user and user group editors security policies 2017-08-22 16:09:06 +10:00
Shannon
8033c6807f Ensures admin can access anything 2017-08-22 13:06:56 +10:00
Shannon
0059f703c5 Adds authorization so that a user cannot access a group it does not belong to 2017-08-22 13:03:59 +10:00
Shannon
e802af109f Adds authorization for create/invite 2017-08-22 12:47:17 +10:00
Shannon
8d93485a08 Adds authorization logic for saving the user 2017-08-22 12:39:21 +10:00
Mads Rasmussen
583302faa2 Merge pull request #2077 from abryukhov/temp-U4-10200 
U4-10200 Listview layouts - empty state not localized
 2017-08-21 21:37:01 +02:00
Sebastiaan Janssen
4404ce94c5 Merge pull request #2142 from abjerner/patch-17 
Typo
 2017-08-21 14:24:52 +02:00
Anders Bjerner
86bc701511 Typo 
Very minor typo, but still ;)
 2017-08-21 14:16:01 +02:00