Shannon
|
c39e1175fd
|
Fixes up some more password changing quirks
|
2017-09-08 13:43:38 +10:00 |
|
Shannon
|
1d5348763d
|
Fixes up invite message, fixes reset password quirk, ensures password values are cleared after changing password, ensures that the confirm password value is not posted to the server
|
2017-09-08 13:15:03 +10:00 |
|
Shannon
|
3c6ab8d34f
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
|
2017-09-08 12:49:36 +10:00 |
|
Shannon
|
0713f12ba6
|
makes new classes internal
|
2017-09-08 12:02:20 +10:00 |
|
Shannon
|
8981fd23a8
|
makes new classes internal
|
2017-09-08 11:41:49 +10:00 |
|
Shannon
|
ab3407a1aa
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Web.UI.Client/src/less/components/umb-packages.less
# src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
# src/Umbraco.Web/Umbraco.Web.csproj
|
2017-09-08 11:31:04 +10:00 |
|
Sebastiaan Janssen
|
dad4eafebd
|
Enable RDP to figure out gulp build problem
|
2017-09-07 22:25:45 +02:00 |
|
Mads Rasmussen
|
96c9ecbdd7
|
fix calc functions
|
2017-09-07 21:39:41 +02:00 |
|
Sebastiaan Janssen
|
e7e04de22e
|
Merge pull request #2179 from umbraco/temp-dperfs
deploy-383 - dperfs
|
2017-09-07 20:46:31 +02:00 |
|
Sebastiaan Janssen
|
7003ef8d26
|
Remove circular dependency
|
2017-09-07 20:42:26 +02:00 |
|
Mads Rasmussen
|
a5c78f6325
|
fix bower.json after merge - copy correct clipboard.js file
|
2017-09-07 20:27:52 +02:00 |
|
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 |
|
Stephan
|
d6f8b878d2
|
perfs - cleanup
|
2017-09-07 13:45:56 +02:00 |
|
Stephan
|
b02b2a61f0
|
perfs - deploy context isCancelled
|
2017-09-07 12:44:08 +02: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 |
|
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 |
|
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
|
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 |
|