Shannon
78f6b8d8bc
Fixes up more the the session id validation, makes sure that the GetUserSecondsMiddleWare also validates the session since this is what keeps the user logged in if that option is being used.
2017-11-08 23:57:17 +11:00
Shannon
0afee71e9e
Fixes locking issue with SessionIdValidator which was forcing a log out in some cases
2017-11-08 22:15:00 +11:00
Shannon
ffa7b922e8
Merge branch 'dev-v7' into dev-v7.8
2017-11-08 19:48:34 +11:00
Shannon
e2c2b8534f
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2017-11-08 19:48:02 +11:00
Shannon
cfd3cc5187
OK... maybe that is now required
2017-11-08 19:47:47 +11:00
Shannon
e6de9e0004
Merge branch 'dev-v7' into dev-v7.8
2017-11-08 19:25:22 +11:00
Sebastiaan Janssen
1f29418ea5
Revert "Adds overloads so you can do paging with the TypedSearch methods."
...
This reverts commit 089f488c15
2017-11-08 09:23:58 +01:00
Shannon
977b30c51a
Revert "more test hacks" which in theory shouldn't be required for 7.7+
2017-11-08 19:23:34 +11:00
Shannon
66a849dd12
Merge branch 'dev-v7.6' into dev-v7
2017-11-08 19:20:28 +11:00
Shannon
637abc384b
more test hacks
2017-11-08 18:46:08 +11:00
Shannon
8959b81f6a
another test fix attempt (this is only for 7.6, this is already fixed in 7.7)
2017-11-08 18:16:17 +11:00
Shannon
32bb8ac5a4
Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6
2017-11-08 17:47:32 +11:00
Shannon
016caba35f
attempt to fix tests
2017-11-08 17:47:18 +11:00
Shannon
9290f61f94
Merge branch 'dev-v7.6' into dev-v7
...
# Conflicts:
# src/Umbraco.Core/Security/MembershipProviderExtensions.cs
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
2017-11-08 17:36:27 +11:00
Shannon Deminick
d522dd7a31
Merge pull request #2313 from umbraco/temp-U4-10620
...
U4-10620 Umbraco 2FA implementation issues
2017-11-08 17:18:31 +11:00
Shannon
95f632e1ea
Adds notes and overrides SendTwoFactorCodeAsync and checks for -1 instead of null
2017-11-08 17:16:11 +11:00
Shannon Deminick
e72ec171f7
Merge pull request #2312 from umbraco/temp-U4-9857
...
Temp u4 9857
2017-11-08 16:06:53 +11:00
Shannon
2538e2e9c9
additional null check
2017-11-08 16:06:23 +11:00
Shannon
08aff2654a
updates installer image
2017-11-08 15:51:14 +11:00
Shannon
0f3a76809b
Merge branch 'dev-v7.8' into temp-U4-10305
...
# Conflicts:
# src/Umbraco.Core/Umbraco.Core.csproj
# src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
2017-11-08 14:52:21 +11:00
Shannon
4f88da2c26
Merge branch 'dev-v7' into dev-v7.8
...
# Conflicts:
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
2017-11-08 14:51:27 +11:00
Daniël Knippers
b1ceeb23b3
Only show characters left is a number of characters is configured on the datatype, hide otherwise
2017-11-07 23:13:59 +01:00
Sebastiaan Janssen
46d0807fa4
Merge pull request #2287 from PerplexDaniel/U4-6985
...
Switching between sections - select last node
2017-11-07 20:26:25 +01:00
Sebastiaan Janssen
9a94ac5317
Implement TwoFactorSignInAsync from Identity repo to make sure our custom GetVerifiedUserIdAsync fires
...
U4-10620 Umbraco 2FA implementation issues
2017-11-07 16:51:40 +01:00
Sebastiaan Janssen
0b904e82b5
Get user by id instead of loginname
...
U4-9857 Umbraco 7.6 - Exception after changing user login name
2017-11-07 16:36:15 +01:00
Claus
c816558936
cleanup.
2017-11-07 15:14:45 +01:00
Mads Rasmussen
4ce0553630
add allowDisable flag on welcome tour
2017-11-07 14:53:44 +01:00
Mads Rasmussen
c773714e2d
fix folder name validation
2017-11-07 14:11:57 +01:00
Sebastiaan Janssen
51fec0c7d3
Remove misleading text, nothing bad will happen when you close the sort panel, sorting is a background task.
2017-11-07 14:03:17 +01:00
Mads Rasmussen
2a90478ba7
fixing typos and the properties tab
2017-11-07 14:00:39 +01:00
Sebastiaan Janssen
87ace12a4f
Prevent double clicks of the Save button
...
U4-10646 Sorting nodes in edge cases can lead to blanking out of property data
2017-11-07 13:49:02 +01:00
Rune Hem Strand
93756a62f4
Update popover width
2017-11-07 11:37:23 +01:00
Rune Hem Strand
2343004be1
Manual merge to init.js tour steps
2017-11-07 11:30:21 +01:00
Rune Hem Strand
d6fe350a4a
Merge branch temp-U4-10305 into temp-tour-review-rune
2017-11-07 11:28:26 +01:00
Rune Hem Strand
71902f3b9b
Update Media library tour
2017-11-07 10:53:02 +01:00
Rune Hem Strand
13b544521d
Update Media library tour
2017-11-07 10:52:39 +01:00
Rune Hem Strand
2cf8c1207d
Update View Home Page step
2017-11-07 10:34:24 +01:00
Daniël Knippers
a1fd73cdb0
Feature Request: Double Click Content Node to Expand
...
Doube-clicking a tree item now expands or collapses a node. It basically does the exact same as clicking the triangle left of the node.
(cherry picked from commit bd2a794b59
2017-11-07 10:30:08 +01:00
Sebastiaan Janssen
a53866953e
Merge pull request #2296 from PerplexDaniel/U4-6259
...
Feature Request: Double Click Content Node to Expand
2017-11-07 10:29:10 +01:00
Sebastiaan Janssen
403502ef1b
Merge pull request #2294 from ja0b/U4-854
...
U4-854 Add MaxLength to Textstring fields --> Fixed
(cherry picked from commit ee4ad36e70
2017-11-06 17:11:12 +01:00
Sebastiaan Janssen
ee4ad36e70
Merge pull request #2294 from ja0b/U4-854
...
U4-854 Add MaxLength to Textstring fields --> Fixed
2017-11-06 17:08:46 +01:00
Sebastiaan Janssen
4f2650277a
Don't need showcharacterslefttext if we're always showing number of chars left
2017-11-06 17:07:14 +01:00
Sebastiaan Janssen
0231a6037e
Always show number of characters left
...
Makes it less magical as to why you can't type any more characters.
2017-11-06 17:03:23 +01:00
Sebastiaan Janssen
db51a5bb44
Update TextboxPropertyEditor.cs
2017-11-06 17:02:34 +01:00
Sebastiaan Janssen
d1b7063e44
Rename textstringnumber.html to textstringlimited.html
2017-11-06 17:02:08 +01:00
Craig
c1769aa299
Position changed from "target" to "center"
...
Prevents modal jumping position on HIDPI screens
(cherry picked from commit 422be31c4e
2017-11-06 14:58:31 +01:00
Sebastiaan Janssen
a571eee945
Merge pull request #2292 from craigs100/U4-10628
...
U4-10628
2017-11-06 14:57:46 +01:00
Mads Rasmussen
ab8653d3de
manual merging
2017-11-06 14:26:55 +01:00
prjseal
143d127fb9
Format date in backoffice based on Users language
...
We have formatted the Created Date and Updated Date using the Current
Culture of the application.
(cherry picked from commit 10ca1239b6
2017-11-06 14:03:54 +01:00
Mads Rasmussen
748a3c167e
Merge branch 'temp-U4-10305' into temp-U4-10544
...
# Conflicts:
# src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
# src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js
2017-11-06 13:58:07 +01:00
