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

20086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
bc148d08fa maps avatars in log 2017-09-07 22:24:18 +10:00
Shannon
57a1e73383 Updates endpoints for both c# and js 2017-09-07 22:03:49 +10:00
Shannon
c7b9a57795 U4-10382 Add end point to get a paginated audit trail 2017-09-07 17:27:37 +10:00
Shannon
eb1edf94d3 Merge branch 'dev-v7.7' into temp-U4-10309 2017-09-06 15:51:01 +10:00
Zsolt
c0b230a95e document type now openable + formatted the create date 2017-09-05 15:15:11 +02:00
Zsolt
607c2cc8e7 used localization and language keys on properties tab 2017-09-05 13:38:34 +02:00
Zsolt
48d3a3defd Made timeline more responsive + restructured the date in the footer 2017-09-05 11:57:22 +02:00
Shannon
66affa7f85 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-09-05 19:22:37 +10:00
Mads Rasmussen
8509285aae move properties/info tab to it's own component 2017-09-04 21:12:47 +02:00
Shannon
af9441010c Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7 2017-09-04 22:04:27 +10:00
Mads Rasmussen
2413e9951f load in moment with locales globally + remove lazy loading from date picker 2017-09-04 14:04:06 +02:00
Shannon
7926a0c676 Simplifies the change password logic with the back office so an admin user can easily change another user's password if they have access to the users section. Updates the controllers to populate the modelstate correctly, changes name of HasAppAccess to HasSectionAccess. Ensure we don't have duplicate ysod dialogs when there is an error. 2017-09-04 22:03:03 +10:00
Stephan
511e9bd3a4 Merge pull request #2160 from umbraco/temp-deploy-360 
deploy-360 - add IUniqueIdentifyingServiceConnector
 2017-09-04 13:52:49 +02:00
Mads Rasmussen
1a444fd703 add date pickers 2017-09-04 12:58:04 +02:00
mikkelhm
895faf41b1 Update version to 7.6.7 2017-09-04 12:28:16 +02:00
Shannon
a0306f9d55 Fixes ability to reset your own password in the user section 2017-09-04 20:15:46 +10:00
Stephan
9a06c3a5ff Implement ILocalizationService.GetDictionaryItemKeyMap 2017-09-04 11:31:20 +02:00
Sebastiaan Janssen
44102df36f Merge pull request #2167 from umbraco/temp-U4-10370 
U4-10370 Culture and hostnames with "æøå" after /
 2017-09-04 11:25:55 +02:00
Shannon
0e0ab81155 Changes AllowManuallyChangingPassword by default to be false 2017-09-04 17:26:45 +10:00
Shannon
a608577a4f Merge branch 'dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Constants-Security.cs
#	src/Umbraco.Core/Security/BackOfficeUserStore.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/UserService.cs
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2017-09-04 16:51:20 +10:00
Sebastiaan Janssen
617a91c57e Merge pull request #2119 from umbraco/temp-U4-10274 
U4-10274 Umbraco.MemberHasAccess isn't cached
 2017-09-01 15:45:55 +02:00
Zsolt
bd68a140ba Merge remote-tracking branch 'origin/temp-U4-10309' into temp-U4-10309 2017-09-01 15:10:50 +02:00
Zsolt
7b34211bb1 bit more responsive + changed the colors to variables in less 2017-09-01 15:09:53 +02:00
Sebastiaan Janssen
cb0e5414b9 Merge pull request #2155 from umbraco/temp-U4-10361 
U4-10361 Creating new member when `AllowManuallyChangingPassword="fal…
 2017-09-01 14:46:58 +02:00
Claus
22cef52261 removing using. 2017-09-01 13:50:51 +02:00
Claus
41e419a49e U4-10370 Culture and hostnames with "æøå" after / 2017-09-01 13:48:39 +02:00
Stephan
efbe97a01d Merge pull request #2149 from umbraco/temp-deploy-358 
Updates the underlying event args base class's AdditionalData diction…
 2017-08-31 18:25:07 +02:00
Stephan
0babb7f28a deploy-358 - reduce allocations in CancellableEventArgs 2017-08-31 18:03:34 +02:00
Stephan
5ba801386c Merge branch 'dev-v7' into temp-deploy-358 2017-08-31 18:03:19 +02:00
Mads Rasmussen
fa78223229 make doc type + go to doc type work 2017-08-31 14:00:20 +02:00
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
Shannon
57a8df8309 fixes tests 2017-08-31 16:47:52 +10:00
Shannon
342ce7e507 updates user authz logic and adds more tests (and fixes test) 2017-08-31 15:53:15 +10:00
Shannon Deminick
7d227a8cd8 Merge pull request #2161 from umbraco/temp-U4-6929 
U4-6929 User permissions security issue
 2017-08-31 15:11:37 +10: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
Stephan
e83d278b9a deploy-360 - missing file 2017-08-30 13:43:16 +02:00
Mads Rasmussen
ede6664e7f allow admins to edit all groups 2017-08-30 13:27:52 +02:00
Stephan
54c4e3b422 deploy-360 - add IUniqueIdentifyingServiceConnector 2017-08-30 12:17:04 +02:00