Barry
|
08965982fd
|
Prevent unsaved dialogue appearing when no changes made on FileUpload property editor
Addresses this issue in media section (U4-9996) and content (U4-7484)
|
2018-02-25 05:50:10 +00:00 |
|
Sebastiaan Jansssen
|
56f4904fc0
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8
|
2018-02-14 12:15:18 +01:00 |
|
Sebastiaan Jansssen
|
9178e7afcf
|
Whoops, no need to introduce a new method here, old method was still available
|
2018-02-14 12:13:01 +01:00 |
|
Sebastiaan Jansssen
|
7746c4a014
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8
# Conflicts:
# src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs
|
2018-02-14 10:28:51 +01:00 |
|
Sebastiaan Janssen
|
b18945e630
|
Merge pull request #2447 from umbraco/temp-Fix-CDF-Version-Change
Updates the CDF version changer to to use a hash of the current versi…
|
2018-02-14 10:25:27 +01:00 |
|
Sebastiaan Jansssen
|
4640cf56d1
|
Make change non-breaking
|
2018-02-14 10:23:58 +01:00 |
|
Shannon
|
eae1ce7012
|
fixes build
|
2018-02-14 12:05:05 +11:00 |
|
Shannon
|
e900711180
|
Updates the CDF version changer to to use a hash of the current version and the date time so that it's not constantly updated if it's not changed.
|
2018-02-14 11:53:49 +11:00 |
|
Mikulas Tomanka
|
d51cda7843
|
Merge pull request #2440 from ProNotion/patch-1
Fixed typo on user section of tour
|
2018-02-12 13:32:10 +01:00 |
|
Claus
|
372ffee42b
|
Merge pull request #2437 from umbraco/temp-UAASSCRUM-1365
allowing to disable the template check when sending content through t…
|
2018-02-12 11:15:26 +01:00 |
|
Claus
|
c1cfea7ebd
|
removing constructor.
|
2018-02-12 11:12:46 +01:00 |
|
ProNotion
|
d3a2d88347
|
Fixed type on user section
|
2018-02-09 17:33:11 +00:00 |
|
Claus
|
93f4d65227
|
Merge pull request #2438 from umbraco/temp-U4-10958
Fixes broken MNTP by switching convert cases to the correct DataType
|
2018-02-09 14:42:08 +01:00 |
|
Robert
|
a4c0342bda
|
Fixes broken MNTP by switching convert cases to the correct DataType
|
2018-02-09 14:09:03 +01:00 |
|
Sebastiaan Janssen
|
6c328d729d
|
Merge pull request #2435 from madsoulswe/temp-U4-10953
U4-10953- Help-drawer, (caption + h3 -> h5
|
2018-02-09 13:32:32 +01:00 |
|
Sebastiaan Jansssen
|
095633ba27
|
Test names were inverted
|
2018-02-09 13:27:25 +01:00 |
|
Claus
|
633d1bb0ae
|
changing the template check to an enabled check instead.
|
2018-02-09 13:19:56 +01:00 |
|
Claus
|
fb89c3da3c
|
allowing to disable the template check when sending content through to render.
|
2018-02-09 12:58:50 +01:00 |
|
Sebastiaan Jansssen
|
3097a46ab3
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
|
2018-02-09 09:57:00 +01:00 |
|
Sebastiaan Jansssen
|
c63156fcd8
|
Bump version to 7.7.11
(cherry picked from commit 0c25c36af0)
|
2018-02-09 09:53:52 +01:00 |
|
Stephan
|
84a90884e3
|
Merge pull request #2433 from umbraco/temp-U4-10947
Fix for not being able to save decimal value
|
2018-02-09 08:14:51 +01:00 |
|
Shannon
|
d29b7311fa
|
reverts the convertible2 back to what it was before
|
2018-02-09 10:08:25 +11:00 |
|
Shannon
|
17b59cc20f
|
Updates the ObjectExtensions TryConvertTo code and moved all unit tests to ObjectExtensionsTests which now all pass
|
2018-02-09 10:02:51 +11:00 |
|
Robert
|
4423571eaa
|
Added ConvertToNullableDecimalTest and check that fixes the decimal save issue
|
2018-02-08 16:21:09 +01:00 |
|
Dennis Öhman
|
750600b202
|
U4-10953
Populate Caption in dashboardhelper
h2 -> h5
|
2018-02-08 15:37:50 +01:00 |
|
Sebastiaan Jansssen
|
28eb4ff03a
|
Bump version to 7.8.1
|
2018-02-08 14:08:38 +01:00 |
|
Sebastiaan Jansssen
|
79517f171c
|
Update UI.xml when upgrading
|
2018-02-08 14:07:54 +01:00 |
|
Stephan
|
e76c42f874
|
Merge pull request #2434 from umbraco/temp-U4-U4-10950
Fix checkbox in nested content
|
2018-02-08 13:42:42 +01:00 |
|
Robert
|
151c35bc47
|
Moving check to TryToConvertValueToCrlType
|
2018-02-08 13:15:43 +01:00 |
|
Robert
|
84265a9716
|
Fix checkbox in nested content
|
2018-02-08 12:18:51 +01:00 |
|
Robert
|
6618388973
|
Fix for not being able to save decimal value
|
2018-02-08 12:10:57 +01:00 |
|
Warren Buckley
|
b280bf73aa
|
Merge pull request #2429 from umbraco/temp-U4-10937
U4-10937 Datepicker on Info tabe and dates on audit trail do not work…
|
2018-02-07 12:13:19 +00:00 |
|
Shannon
|
a6d57a5f6d
|
Updates the dateHelper when converting to a local date, we need to check if the current string format is in UTC format and ensure that it's loaded that way
|
2018-02-07 12:51:15 +11:00 |
|
Shannon
|
6b7a83c6c9
|
Updates logic for setting the scheduled publishing date/times to ensure that the local date/time is displayed but the server time is persisted
|
2018-02-07 11:17:02 +11:00 |
|
Sebastiaan Jansssen
|
eb5f2e29a3
|
U4-10937 Datepicker on Info tabe and dates on audit trail do not work if server time needs offsetting
|
2018-02-06 19:15:15 +01:00 |
|
Mikkel Holck Madsen
|
cf86409e3f
|
Merge pull request #2427 from umbraco/temp-U4-10935
fixes: U4-10935 Intro tour doesn't start automatically on cloud
|
2018-02-06 11:04:02 +01:00 |
|
Mads Rasmussen
|
134f5e2601
|
fixes: U4-10935 Intro tour doesn't start automatically on cloud
|
2018-02-06 10:14:30 +01:00 |
|
Sebastiaan Jansssen
|
37ac524e8e
|
Don't enable tours for upgraders
|
2018-02-05 22:37:47 +01:00 |
|
Sebastiaan Jansssen
|
43af2f8e55
|
Fix UI docs generator
|
2018-02-05 21:12:25 +01:00 |
|
Sebastiaan Jansssen
|
a20584e3de
|
Not beta009, Final!
|
2018-02-01 16:18:49 +01:00 |
|
Sebastiaan Jansssen
|
19ec26fef9
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8
|
2018-02-01 15:20:13 +01:00 |
|
Claus
|
527f98189a
|
Merge pull request #2423 from umbraco/temp-u4-10897
temp U4-10897
|
2018-02-01 13:29:45 +01:00 |
|
Sebastiaan Janssen
|
78c289a559
|
Merge pull request #2425 from umbraco/mittonp-dev-v7
Mittonp dev v7
|
2018-02-01 08:59:35 +01:00 |
|
Sebastiaan Jansssen
|
646abb3aea
|
Merge branch 'dev-v7' of https://github.com/mittonp/Umbraco-CMS into mittonp-dev-v7
# Conflicts:
# src/Umbraco.Web.UI/umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web.UI/umbraco/config/lang/es.xml
# src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
# src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
|
2018-02-01 08:57:47 +01:00 |
|
Sebastiaan Janssen
|
2af59471a2
|
Merge pull request #973 from mattbrailsford/dev-v7-insertmacrofix
Updated insert macro dialog to prevent closing on enter key
|
2018-02-01 08:28:59 +01:00 |
|
Sebastiaan Jansssen
|
b76b09026b
|
Merge branch 'dev-v7' into dev-v7.8
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI.Client/src/assets/img/installer.jpg
# src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
# src/Umbraco.Web.UI.Client/src/controllers/search.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/tours/umbintrocreatedoctype/doctypename/doctypename.controller.js
# src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
# src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
# src/Umbraco.Web/Editors/TourController.cs
# src/Umbraco.Web/Models/BackOfficeTour.cs
# src/Umbraco.Web/Models/BackOfficeTourStep.cs
# src/Umbraco.Web/Models/Mapping/UserModelMapper.cs
# src/Umbraco.Web/TourFilterResolver.cs
# src/Umbraco.Web/Trees/MacroTreeController.cs
# src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
# src/umbraco.cms/businesslogic/Packager/Installer.cs
# src/umbraco.cms/businesslogic/Packager/PackageInstance/utill.cs
|
2018-01-31 17:02:03 +01:00 |
|
Sebastiaan Janssen
|
090f89e5b6
|
Merge pull request #2223 from kgiszewski/fix/U4-6309
U4-6309: Fix black bars that appear on a RTE image resize
|
2018-01-31 10:43:29 +01:00 |
|
Stephan
|
4870afd2d3
|
U4-10897 - change enlisting priorities
|
2018-01-30 14:27:58 +01:00 |
|
Stephan
|
80257b6684
|
Revert "U4-10897 - change enlisting priorities"
This reverts commit 8f3a0b6919.
|
2018-01-30 14:26:59 +01:00 |
|
Stephan
|
8f3a0b6919
|
U4-10897 - change enlisting priorities
|
2018-01-30 14:25:43 +01:00 |
|