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

20127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
6ea92daa70 fixes merge removes unused file 2017-09-07 23:03:01 +10:00
Shannon
65ece33ca9 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Core/Models/UmbracoObjectTypes.cs
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/gruntFile.js
#	src/Umbraco.Web.UI.Client/src/installer/_module.js
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
 2017-09-07 22:43:03 +10:00
Shannon Deminick
85758011b5 Merge pull request #2140 from umbraco/temp-U4-10268_2 
U4-10268 7.7 Beta - Changing password should be safe by default
 2017-09-07 22:38:45 +10:00
Shannon Deminick
49a48bbfce Merge pull request #2169 from umbraco/temp-deploy-391 
deploy-391 - allow for id reservation
 2017-09-07 22:35:21 +10:00
Warren Buckley
663d9fcfe8 Merge pull request #2075 from defsteph/U4-10197 
U4-10197 Added missing translations for Swedish
 2017-09-07 13:33:55 +01:00
Sebastiaan Janssen
56dc10a4f7 Merge pull request #2158 from umbraco/temp-gulp-spike 
U4-10261 Change frontend build setup from grunt to gulp
 2017-09-06 23:52:48 +02:00
Warren Buckley
df8c75438a Merge pull request #2168 from ronaldbarendse/U4-9374 
U4-9374 Navigation panel header and editor panel header don't line up properly in Firefox
 2017-09-06 12:37:45 +01:00
Warren Buckley
2d53da55a7 Merge pull request #2173 from tomfulton/u4-8886-2 
U4-8886 - TinyMCE - highlight media picker toolbar icon when image selected
 2017-09-06 12:25:01 +01:00
Claus
e1de9452b2 Merge pull request #2170 from umbraco/temp-U4-10333 
U4-10333 Invite user needs extensibility points to work with Umbraco Cloud when no SMTP is set
 2017-09-06 11:29:05 +02:00
Claus
25cb76e842 Merge remote-tracking branch 'origin/dev-v7.7' into temp-U4-10333 
# Conflicts:
#	src/Umbraco.Web/Editors/UsersController.cs
 2017-09-06 11:25:11 +02:00
Mikkel Holck Madsen
b9baeea1a1 Merge pull request #2171 from umbraco/temp-U4-10368 
U4-10368 Need option to set username different than e-mail for AD compatibility
 2017-09-06 10:59:23 +02:00
Mikkel Holck Madsen
dfa1a098c8 Merge pull request #2172 from umbraco/temp-U4-10214 
U4-10214 Disable ability to delete admin group
 2017-09-06 09:39:25 +02:00
mikkelhm
3b741d3075 Disallow selection of the admin group, as it should never be allowed 2017-09-06 09:37:35 +02:00
Claus
5ac0841ee4 Merge pull request #2175 from umbraco/temp-U4-10325 
U4-10325 Media insert in grid should use UDIs
 2017-09-06 09:24:02 +02:00
Claus
63b2d10e86 Merge pull request #2164 from umbraco/temp-U4-10374 
U4-10374 EntityService, ContentService and MediaService should use a …
 2017-09-06 09:12:12 +02:00
Shannon
616b9b0e92 U4-10325 Media insert in grid should use UDIs 2017-09-06 14:50:44 +10:00
Tom Fulton
1578bc8cc7 U4-8886 - TinyMCE - highlight media picker toolbar icon when image selected 2017-09-05 13:20:18 -04:00
Shannon
d32093136f U4-10214 Disable ability to delete admin group 2017-09-05 23:41:58 +10:00
Shannon
f3f31f2569 Gets invite and create user working with new setting and allowing specifying a separate username. 2017-09-05 23:31:26 +10:00
Stephan
e7c231c5a8 Support IdReservation in IdkMap 2017-09-05 15:23:18 +02:00
Shannon
456b5fcee0 updates config template 2017-09-05 22:46:13 +10:00
Shannon
0dee1f0fac U4-10368 Need option to set username different than e-mail for AD compatibility 2017-09-05 22:35:40 +10:00
Shannon
1f7a5ff90a bumping version 2017-09-05 19:28:18 +10:00
Shannon
f209ad2019 Merge branch 'dev-v7.7' into temp-U4-10333 2017-09-05 19:23:45 +10: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
Shannon
2590ee51ec cleans up event args and makes internal 2017-09-05 19:20:33 +10:00
Shannon
4b7bd6482e Creates new EmailSender which should take the place throughout the codebase for sending emails in the Core. Have replaced most places where SMTP is used directly (but not the notifications part since that is more complicated right now). Added the internal event and special usage so we can raise an event to send an email if smtp is not configured. 2017-09-05 18:52:03 +10:00
Shannon
8ff89c4f48 U4-10385 Examine indexing performance bottleneck: IUserService.GetProfileById which is not cached 2017-09-05 16:41:06 +10:00
Sebastiaan Janssen
a9cda9d651 Merge branch 'dev-v7' into temp-gulp-spike 2017-09-04 21:37:49 +02:00
Sebastiaan Janssen
ad19eb8dff Update node version and remove unused npm reference 2017-09-04 20:14:31 +02:00
Sebastiaan Janssen
e511554a42 Adds less as a dependency so that the build can complete 2017-09-04 20:10:19 +02:00
Stephan
344b52d10f deploy-391 - allow for id reservation 2017-09-04 17:04:48 +02:00
Sebastiaan Janssen
2121b7c8a0 Node version 2017-09-04 14:07:06 +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
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
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
Ronald Barendse
207d6b53b5 Fixed .umb-panel-header-content-wrapper height 
The .umb-panel-header-content-wrapper was 1 pixel higher than the parent .umb-panel-header, now both heights are 99px.
 2017-09-04 11:22:56 +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
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