Sebastiaan Janssen
388d660e11
Raise event when login succeeds after 2FA challenge. Raise event when locked out during 2FA attempts.
2017-09-15 15:12:40 +02:00
Sebastiaan Janssen
b6dbc245e2
Merge branch 'dev-v7' into temp-U4-8634
2017-09-15 13:57:46 +02:00
Sebastiaan Janssen
3efba6b576
Update title of preview window
2017-09-15 13:52:26 +02:00
Sebastiaan Janssen
3803785569
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-15 13:51:23 +02:00
Sebastiaan Janssen
54407a66a4
Fixes canvas designer
2017-09-15 13:50:43 +02:00
Sebastiaan Janssen
3f82781c0f
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-14 16:15:43 +02:00
Sebastiaan Janssen
bca46f11ad
Makes the sort order input same size as the one on tabs
2017-09-14 16:11:23 +02:00
Warren Buckley
a86b8f786d
Merge pull request #1817 from marcemarc/temp-U4-6738
...
Relates to Issue U4-6738 - Allow viewing/sorting of composition properties.
2017-09-14 14:55:48 +01:00
Warren Buckley
ac3eaf43cb
Forgot to revert the logic for the extra button/label click to show the sort order on properties
2017-09-14 14:16:47 +01:00
Robert
f6d4170010
Merge pull request #1633 from bjarnef/dev-v7-U4-9149
...
fixes: U4-9149 - Fix z-index of focal point
2017-09-14 15:15:51 +02:00
Warren Buckley
2b0ea45da9
Remove the extra button/click in the UI & show the property sortOrder value when we are sorting
2017-09-14 14:13:42 +01:00
Warren Buckley
07d05c9e0d
Revert "toggle the show ordinals label button to hide, when in show ordinal mode"
...
This reverts commit 51215f11af
2017-09-14 14:09:00 +01:00
Warren Buckley
26a5682a14
Revert "add language translations keys for showOrdinals and hideOrdinals"
...
This reverts commit 8ab2f7c257
2017-09-14 14:08:00 +01:00
Sebastiaan Janssen
5ab364781b
Sync en and en_us language
2017-09-14 14:29:53 +02:00
Sebastiaan Janssen
c2d328685d
Remove wrong and misleading translation key that's unused
2017-09-14 14:29:26 +02:00
Mads Rasmussen
c013be4f36
add missing language keys for en_us.xml
2017-09-14 14:04:25 +02:00
Sebastiaan Janssen
f3fc2bcfb8
Merge pull request #2177 from umbraco/temp-U4-10384
...
U4-10384 Error when changing content type on media item
2017-09-14 13:46:32 +02:00
Robert
c8d49ed5a7
Merge pull request #2195 from umbraco/temp-U4-10413
...
fixes: U4-10413 Composition/Reorder bar gets in the way when editing …
2017-09-14 11:41:04 +02:00
Mads Rasmussen
9c2b0a3ef6
fixes: U4-10413 Composition/Reorder bar gets in the way when editing or adding a property
2017-09-14 11:04:34 +02:00
Shannon
703c3eefe8
Fixes issue with trying to log in as a user that is disabled.
2017-09-14 19:00:59 +10:00
Shannon
4ab67d8cff
fix build
2017-09-14 18:28:02 +10:00
Shannon
f8d165599d
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-14 18:10:59 +10:00
Stephan
9355a81716
comments
2017-09-14 10:08:35 +02:00
Per Ploug
87575e9067
Reverting grid config
2017-09-14 10:04:04 +02:00
Sebastiaan Janssen
a5b31e94b6
Merge pull request #2194 from umbraco/temp-U4-10409
...
temp - vsts troubleshooting
2017-09-14 09:32:04 +02:00
Shannon
3815a6c607
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-14 16:17:44 +10:00
Shannon Deminick
f9e094a00a
Merge pull request #2193 from gunnim/dev-v7
...
U4-9562 - HealthCheckResolver from internal to public
2017-09-14 15:36:13 +10:00
Gunnar Már Óttarsson
053175a5a6
Fix http://issues.umbraco.org/issue/U4-9562
...
Change HealthCheckResolver to public allowing DI
2017-09-13 19:24:46 +00:00
Stephan
ce7488a924
temp - vsts troubleshooting
2017-09-13 18:23:19 +02:00
Sebastiaan Janssen
6cd2a15964
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# src/Umbraco.Core/UdiEntityType.cs
2017-09-13 17:34:35 +02:00
Sebastiaan Janssen
f442599633
Merge pull request #2191 from umbraco/temp-U4-10409
...
U4-10409 UDI Parsing should not require scanning assemblies
2017-09-13 17:28:33 +02:00
Sebastiaan Janssen
37b6b42570
Merge branch 'temp-U4-10409' of https://github.com/umbraco/Umbraco-CMS into temp-U4-10409
2017-09-13 17:20:49 +02:00
Stephan
f1149fb826
U4-10409 - revert unwanted files
2017-09-13 17:20:06 +02:00
Sebastiaan Janssen
3f8f96e8c3
Merge branch 'dev-v7' into temp-U4-10409
2017-09-13 17:18:09 +02:00
Sebastiaan Janssen
8ebbfca17d
Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7
2017-09-13 13:15:28 +02:00
Sebastiaan Janssen
076a8e0e23
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# src/umbraco.sln
2017-09-13 13:09:20 +02:00
Stephan
44da6c9f97
Merge pull request #2188 from umbraco/temp-U4-10401
...
U4-10401 Being able to rename Data Type folders
2017-09-13 13:08:09 +02:00
Sebastiaan Janssen
a75181bd7f
Update sln to not refer to old build scripts any more
2017-09-13 13:07:22 +02:00
Stephan
058ad9f99a
Merge branch 'dev-v7.7' into temp-U4-10401
2017-09-13 12:12:10 +02:00
Sebastiaan Janssen
dd440eb9d5
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
2017-09-13 12:09:17 +02:00
Sebastiaan Janssen
00b469b61b
Easy ps script to just update the Umbraco version without having to do a full build
2017-09-13 12:07:29 +02:00
Sebastiaan Janssen
83f08538c2
U4-10407 We should log unhandled exceptions that occur in webapi controllers and always have detailed errors returned to users even when not in debug mode
...
# Conflicts:
# src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
2017-09-13 12:05:02 +02:00
Sebastiaan Janssen
aafe0e1c6c
Merge pull request #2189 from umbraco/temp-U4-10407
...
U4-10407 We should log unhandled exceptions that occur in webapi controllers and always have detailed errors returned to users even when not in debug mode
2017-09-13 12:04:29 +02:00
Stephan
ef91e152b4
U4-10409 - udi parsing and assembly scanning
2017-09-13 12:00:56 +02:00
Stephan
add0685d3f
U4-10409 - udi parsing
2017-09-13 09:35:17 +02:00
Shannon
27fc3a9bb3
U4-10409 UDI Parsing should not require scanning assemblies
2017-09-13 14:16:43 +10:00
Shannon Deminick
bbc625f65d
Merge pull request #2190 from abryukhov/temp-U4-10404
...
U4-10404 - v7.7 - added & changed UI localization keys sync for RU language
2017-09-13 09:44:53 +10:00
Alexander Bryukhov
8b34ab24f4
v7.7 - added & changed UI localization keys sync for RU language
2017-09-12 23:54:17 +07:00
Stephan
e8faf54edf
Merge pull request #2187 from umbraco/temp-U4-10118
...
temp u4 10118
2017-09-12 16:05:55 +02:00
Stephan
8548ee7761
u4-10118 - don't create a FS provider manager just to reset it
2017-09-12 16:05:35 +02:00
