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
Marcin Zajkowski
e14aba3875
More no-dirty-checks and code polishment
2017-11-07 23:21:50 +01: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
579c572dd8
Oops, missed that I was passing a string array into the int array param
2017-11-07 18:36:37 +01:00
Sebastiaan Janssen
bbf4c18825
U4-10646 Sorting nodes in edge cases can lead to blanking out of property data
2017-11-07 17:12:04 +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
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
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
Matt Darby
77162e4b51
Move val-email attribute before required attribute
2017-11-07 19:17:42 +07:00
Sebastiaan Janssen
632f84904f
Merge branch 'dev-v7.6' into dev-v7
2017-11-07 10:32:12 +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
Bjarne Fyrstenborg
e72758e04a
Ensure box is square when picker is multiple picker
2017-11-06 22:01:35 +01:00
Bjarne Fyrstenborg
9d373c194d
Show thumbnails if any images/files has been selected
2017-11-06 21:42:01 +01:00
Bjarne Fyrstenborg
856e123ec2
Oops - remove duplicated disableFolderSelect
2017-11-06 19:23:41 +01:00
Bjarne Fyrstenborg
0b2af6b48f
Fix square image in imagepicker prevalue editor. Cleanup and consistency
2017-11-06 19:12:27 +01:00
Sebastiaan Janssen
ff996b05f0
Merge branch 'dev-v7.6' into dev-v7
2017-11-06 17:30:00 +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
Sebastiaan Janssen
364d4b11e8
Merge branch 'dev-v7.6' into dev-v7
2017-11-06 15:00:05 +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
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
Lewis Smith
01cf2e240a
U4-10627 - Updated stats / facts when installing.
...
U4-10627 Update some of the Umbraco Installer facts. Updated the facts you get when installing umbraco. All facts that were changed were taken from the Umbraco page.
https://umbraco.com/blog/codegarden-2017-the-aftermath/
https://umbraco.com/blog/codegarden-2017/
(cherry picked from commit 69258fee7b
2017-11-06 13:51:43 +01:00
Tim
49689d5057
Fixes missing content type check.
...
(cherry picked from commit 80d605beac
2017-11-06 13:48:09 +01:00
Andy Felton
f722d7731d
Fixed URL Tracker button colour
...
(cherry picked from commit bb9a0258df
2017-11-06 13:47:05 +01:00
Sebastiaan Janssen
74ba3261ff
Merge branch 'dev-v7.6' into dev-v7
2017-11-06 12:33:48 +01:00
Sebastiaan Janssen
ac42f335c2
Fix U4-4889 checkbox in template
2017-11-06 12:33:12 +01:00
Sebastiaan Janssen
f0eefbd5af
U4-10636 Removed '#' from 'value' when generating alias
2017-11-06 12:31:06 +01:00
Sebastiaan Janssen
ed48f29e3a
Merge pull request #2300 from dernafees/dev-v7
...
Fix U4-4889 checkbox in template.
2017-11-06 12:28:32 +01:00
Sebastiaan Janssen
03c5d5197b
Updates a few more fields to make sure clicking on labels focuses the field
2017-11-06 12:28:14 +01:00
Sebastiaan Janssen
7f0921bd96
Delete web.config.temp-build.0
2017-11-06 12:09:15 +01:00
Sebastiaan Janssen
c38b49b1cf
Delete vwd.webinfo
2017-11-06 12:08:45 +01:00
Sebastiaan Janssen
c4dfbd4a1c
Merge pull request #2304 from pbres/dev-v7
...
U4-10636 Unable to generate alias for localized name
2017-11-06 12:04:16 +01:00
Sebastiaan Janssen
9b1e5d7649
Update entity.resource.js
2017-11-06 12:03:53 +01:00
