Commit Graph

20888 Commits

Author SHA1 Message Date
Stephan
dbda6689b6 perfs - suspendable 2017-09-06 18:50:54 +02:00
Stephan
8d6c8ef282 perfs - support LocalDb 2017-09-06 18:50:41 +02:00
Mads Rasmussen
12b4587828 null check for change password 2017-09-06 14:33:01 +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
Mads Rasmussen
77d240c69a don't show disallow cursor on the more button on a tree item (the three dots) 2017-09-06 13:31:13 +02: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
Mads Rasmussen
119dd5af29 auto expand tree to nodes with access 2017-09-06 13:11:58 +02:00
Robert
18d0fec014 Added some trimming and test to StripHtmlTags 2017-09-06 12:03:15 +02: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
Robert
851d587d1f Added Html Strip tests 2017-09-06 11:28:44 +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
Robert
6a3f94d0e1 Forgot to clean test names 2017-09-06 11:19:30 +02:00
Robert
b1358936b4 Cleaning up tests and useless TruncateByWords functions 2017-09-06 11:17:06 +02:00
Robert
b2798e38f7 Replaced html stripping with already existing function, removing unused code 2017-09-06 11:12:14 +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
Bitmapped
606abd8ac7 Restructure per discussion in U4-10369 2017-09-06 00:43:27 -04:00
Shannon
2efe2cc88a Ensures that a user that has multiple start nodes cannot select the root start node in the tree dialogs 2017-09-06 12:54:32 +10:00
Shannon
8b17d69d32 Merge branch 'temp-U4-10389' into temp-U4-10275 2017-09-06 12:03:55 +10:00
Shannon
8ad1d247fa U4-10389 Some webforms editors do not authorize on the user's path access or permissions set for the editing node 2017-09-06 11:49:00 +10:00
Shannon
6cc4ab9348 Ensure the user can still refresh nodes they don't have access to when viewing 'site'/branch nodes with multiple start nodes 2017-09-06 10:45:38 +10:00
Shannon
a603fd0c46 Merge branch 'TEMP-u4-10135' of https://github.com/umbraco/Umbraco-CMS into TEMP-u4-10135
# Conflicts:
#	src/Umbraco.Web/HtmlStringUtilities.cs
2017-09-06 10:05:00 +10:00
Shannon
4b5c49907c switches to constant - comments out what seems to be a totally unused variable 2017-09-06 10:01:39 +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
c860069215 Updates logic to ensure that if we are rendering site nodes that we don't render all of their children, we will filter out any nodes that do not belong to the user's start nodes' branches 2017-09-06 00:38:31 +10:00
Shannon
186fd1166a Merge branch 'dev-v7.7' into temp-U4-10275 2017-09-05 23:48:11 +10: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
84fd5dc2ee perfs - IContentService.IsPublishable 2017-09-04 19:49:28 +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