yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,451 Commits 4 Branches 7 Tags
7746c4a01462dcfd1c43e2da49cd5a39f211bfcb
Commit Graph

18355 Commits

Author SHA1 Message Date
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 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
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
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
Mads Rasmussen
134f5e2601 fixes: U4-10935 Intro tour doesn't start automatically on cloud 2018-02-06 10:14:30 +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
Stephan
9fd2f34343 U4-10897 - defer Examine indexing until scope is all done 2018-01-30 13:53:37 +01:00
Stephan
e774717346 U4-10897 - expose enlisted mutable Xml in events 2018-01-30 13:14:01 +01:00
Warren Buckley
5f5759c8a3 Merge pull request #2422 from umbraco/temp-U4-10869 
U4-10869 Make sure the getting started tour is only shown to the right users
 2018-01-30 09:10:12 +00:00
Robert
0b90097aad "requiredSections" tour property documentation 
Added a few words about "requiredSections" tour property
 2018-01-30 10:00:54 +01:00
Sebastiaan Jansssen
7cd540c37e Remove additional premature uses of C#7 features 2018-01-29 14:35:30 +01:00
Sebastiaan Jansssen
83595ecaf5 Don't rely on C# 7 features 2018-01-29 14:06:25 +01:00
Robert
e07c5e6ff8 Removed unused using directives 2018-01-29 13:18:11 +01:00
Robert
67ff827d67 Tours will only load if the current user has access to the same sections the tours has access to 2018-01-29 13:13:43 +01:00
Sebastiaan Jansssen
3f7159797f U4-10880 Update install background 2018-01-29 09:49:16 +01:00
Robert
6f81b7fe24 'getting-started' tour only available to admins 2018-01-25 12:10:34 +01:00