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

21363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert
6618388973 Fix for not being able to save decimal value 2018-02-08 12:10:57 +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 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
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
Stephan
f2819f61e5 Merge pull request #2417 from umbraco/temp-u4-10846 
U4-10846 - fix member group cache
 2018-01-25 11:06:17 +01:00
Sebastiaan Janssen
2107e9d9e3 Merge pull request #2420 from PerplexDaniel/patch-1 
Fix NullReferenceException when HttpContext is not available
 2018-01-25 10:18:32 +01:00
Daniël Knippers
c623b448ba Fix NullReferenceException when HttpContext is null 
This method will throw a NullReferenceException in contexts without an HttpContext, like is the case in background threads. As HttpContext is only used to set an isDebug flag, it seems more sensible to not throw in cases without an HttpContext, but simply set isDebug to false instead. If this is not acceptable behavior, could we perhaps look at something other than HttpContext.Current.IsDebuggingEnabled to decide whether isDebug should be set?
 2018-01-25 08:56:46 +01:00
Sebastiaan Janssen
8bb49f57e8 Merge pull request #2419 from umbraco/redmorello-U4-10864_close_back_office_search_results 
Redmorello u4 10864 close back office search results
 2018-01-24 17:47:44 +01:00
Sebastiaan Jansssen
da0b1c2f23 Merge branch 'U4-10864_close_back_office_search_results' of https://github.com/redmorello/Umbraco-CMS into redmorello-U4-10864_close_back_office_search_results 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
 2018-01-24 17:43:19 +01:00
Sebastiaan Jansssen
a288fc62eb Workaround: keep the cache we used to have but clear all cache for membergroups when a member group changes 2018-01-24 17:26:21 +01:00
Sebastiaan Jansssen
82e50ccd3a Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-01-24 16:13:31 +01:00
Sebastiaan Jansssen
15b0dc9f29 Merge branch 'dev-v7.8' of https://github.com/kristoffer-tvera/Umbraco-CMS into kristoffer-tvera-dev-v7.8 2018-01-24 16:12:06 +01:00
Sebastiaan Janssen
8057d09fc2 Merge pull request #2416 from PeteDuncanson/patch-1 
Prevent Pinterest messing with media in the back office
 2018-01-24 15:53:40 +01:00
Sebastiaan Jansssen
8877100bf0 Merge branch 'dev-v7' into temp-u4-10846 2018-01-24 15:50:08 +01:00
Stephan
41c96e6e26 Merge pull request #2398 from leekelleher/issue/U4-10756 
Proposed patch for U4-10756 - Guid TypedContent performance
 2018-01-24 15:27:43 +01:00
Sebastiaan Jansssen
abdd117264 Fixes bug in MB 3.0.9 2018-01-24 15:26:40 +01:00
Sebastiaan Jansssen
6272dac698 Use string.Format instead of interpolation 2018-01-24 14:34:21 +01:00
Sebastiaan Jansssen
7a4b5fa796 Bump version to 7.7.10 2018-01-24 14:34:03 +01:00
Sebastiaan Jansssen
c962132ee0 Update to ModelsBuilder 3.0.9 2018-01-24 14:33:32 +01:00
leekelleher
0780979469 Eagerly populating the Guid lookup 
as per @Shazwazza's comment: https://github.com/umbraco/Umbraco-CMS/pull/2398#issuecomment-358752346

Tested against 12,000 nodes (in the XML cache), profiling showed it took 55ms.
 2018-01-24 11:53:52 +00:00
leekelleher
a42e568fdf Initialized the ConcurrentDictionary statically 
as per @JimBobSquarePants's comment: https://github.com/umbraco/Umbraco-CMS/pull/2398#discussion_r162799543
 2018-01-24 11:51:53 +00:00
Robert
e62661cc6a Merge pull request #2397 from leekelleher/issue/U4-10845 
U4-10845 MNTP value-converter - trashed content causes database lookups
 2018-01-24 12:48:29 +01:00
leekelleher
6841b2ac61 Amended the lookup dictionary setter, 
as per @JimBobSquarePants's comment: https://github.com/umbraco/Umbraco-CMS/pull/2398#discussion_r162522998
 2018-01-24 10:29:23 +00:00
leekelleher
f7f4276485 Removed the need for the UseLegacyXmlSchema check 
The enhancement in PR #2367 removed the `"@isDoc"` check,
which was the main difference between the legacy and current XML schema.

Reducing the XPath to `"//*[@key=$guid]"` will perform the same for both types of schema.
_(and saves on a couple of allocations)_
 2018-01-24 10:29:23 +00:00
leekelleher
bb9e23ca3e Proposed patch for U4-10756 - Guid TypedContent performance 
This is a proposal for a temporary workaround to issue U4-10756.

It uses a local static ConcurrentDictionary to store a lookup of Guid/int values.
If the Guid isn't in the lookup, then the traditional XPath is used, which would add the resulting node ID (int) to the lookup.
If the lookup contains the Guid, then the returned int value will be used to perform a more efficient retrieval.

<http://issues.umbraco.org/issue/U4-10756>
 2018-01-24 10:29:23 +00:00
Sebastiaan Janssen
7d5d69e2e3 Merge pull request #2418 from abjerner/patch-36 
Nested Content should use the new turquoise/purple colors as the rest of the backoffice
 2018-01-23 22:02:16 +01:00
Anders Bjerner
ee75158dd0 Nested Content should use the new turquoise/purple colors as the rest of the backoffice 2018-01-23 21:55:15 +01:00
Stephan
c022397d86 U4-10846 - fix member group cache 2018-01-23 20:54:47 +01:00
Shannon
d104525a50 Updates core to use latest CDF version 2018-01-23 11:15:37 -07:00
Sebastiaan Janssen
b0a64aa4b5 Merge pull request #2384 from umbraco/temp-u4-10822 
U4-10822 - refactor view models binding error handling
 2018-01-23 16:24:08 +01:00
Pete Duncanson
ca86385269 Prevent Pinterest messing with media in the back office 
Fixes: http://issues.umbraco.org/issue/U4-10865
 2018-01-23 15:10:09 +00:00
Claus
ef4322a9b3 Merge pull request #2414 from umbraco/temp-u4-10844 
U4-10844 - delete blueprints with content types
 2018-01-23 15:15:15 +01:00
Sebastiaan Janssen
4ab1c51327 Merge pull request #2392 from umbraco/temp-u4-10829 
U4-10829 - fix tree controller
 2018-01-23 14:13:39 +01:00
Stephan
e007a37c36 U4-10844 - delete blueprints with content types 2018-01-23 13:41:36 +01:00
Sebastiaan Janssen
2f67008987 Merge pull request #2407 from abjerner/patch-34 
Removed unnecessary &nbsp;
 2018-01-23 09:42:30 +01:00
Sebastiaan Janssen
1672e284c5 Merge pull request #2406 from abjerner/patch-33 
Minor casing change
 2018-01-23 09:41:46 +01:00
Ian Houghton
60ce36a7f2 U4-10864 add button when search returns no results, to clear the search 2018-01-22 22:03:35 +00:00
Anders Bjerner
72e2cacc87 Removed unnecessary &nbsp; 2018-01-22 18:16:42 +01:00