yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,422 Commits 4 Branches 7 Tags
797eb34f36aaf691ae482d115e67e78692d98c96
Commit Graph

15422 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
797eb34f36 Fixes merge issues and tests 2016-02-03 13:43:51 +01:00
Shannon
e423864781 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicy.cs
	src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicyFactory.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
	src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Cache/FullDataSetCachePolicyTests.cs
	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
	src/Umbraco.Web.UI.Client/src/less/hacks.less
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/WebBootManager.cs
 2016-02-03 12:30:11 +01:00
Shannon
aed4649ff5 changes version to RC1 2016-02-03 12:16:07 +01:00
Shannon Deminick
36119848e7 Merge pull request #1085 from umbraco/temp-U4-7861 
U4-7861 - fix moving a content type
 2016-02-03 12:13:31 +01:00
Shannon Deminick
8080746004 Merge pull request #1091 from umbraco/temp-U4-7885 
U4-7885 - fix YSOD when saving a member type
 2016-02-03 11:59:24 +01:00
Simon Busborg
ae9fba87b5 Removed white background from member types builder 2016-02-03 11:46:33 +01:00
Claus
076efad616 Merge pull request #1084 from umbraco/temp-U4-7713 
U4-7713 - fix CountPublished
 2016-02-03 11:45:15 +01:00
Stephan
df3aaf43d3 U4-7885 - fix YSOD when saving a member type 2016-02-03 11:33:34 +01:00
Shannon
5d5c6ed33a fixes ysod with media types and member types 2016-02-03 11:21:01 +01:00
Shannon
856c345905 Merge branch '7.3.7' of https://github.com/umbraco/Umbraco-CMS into 7.3.7 2016-02-02 18:01:56 +01:00
Shannon
b2cd5dfb85 adds null check to session id - might not exist in old cookies 2016-02-02 18:01:36 +01:00
Sebastiaan Janssen
462f7a59b5 Merge pull request #1078 from dawoe/U4-7872 
Use product name in migration runner instead of Umbraco productname
 2016-02-02 17:06:56 +01:00
Shannon
22689d24ec changes port 2016-02-02 17:05:21 +01:00
Shannon Deminick
ee303957b8 Merge pull request #1078 from dawoe/U4-7872 
Use product name in migration runner instead of Umbraco productname
 2016-02-02 17:04:45 +01:00
Shannon
4055afdf05 Merge branch '7.3.7' of https://github.com/umbraco/Umbraco-CMS into 7.3.7 2016-02-02 16:52:08 +01:00
Shannon
a1c70a219a ensures correct sort order for content type queries + test 2016-02-02 16:51:57 +01:00
Stephan
3f23b06e24 U4-7861 - fix moving a content type 2016-02-02 16:40:01 +01:00
Sebastiaan Janssen
3151515855 U4-7072 Grid TinyMce with style_formats throws "Cannot assign to read only property 'name' 2016-02-02 16:09:02 +01:00
Shannon
25df9da715 bumps Version 2016-02-02 16:00:28 +01:00
Shannon
9c2f438476 fixes tests 2016-02-02 15:43:44 +01:00
Simon Busborg
a763602aeb Fixes: U4-7072 Grid TinyMce with style_formats throws "Cannot assign to read only property 'name' 2016-02-02 15:38:12 +01:00
Shannon
0de3be42cf U4-7869 Examine & SQL Azure - Timeouts - ensure the other reader is executed with retry. 2016-02-02 15:33:22 +01:00
Shannon
1545e0eed7 Merge branch '7.3.7' of https://github.com/umbraco/Umbraco-CMS into 7.3.7 2016-02-02 15:14:56 +01:00
Shannon
42a7ed6877 U4-7821 KeepUserLoggedIn with a long umbracoTimeOutInMinutes has logout issues 2016-02-02 15:14:47 +01:00
Sebastiaan Janssen
98b8aedc4d U4-7849 Unclear error message when applying public access 2016-02-02 15:13:57 +01:00
Simon Busborg
4812f1d603 Fixes: U4-7725 Backend / Full witdth image / Settings / Set a background image - Is out of focus. 2016-02-02 15:11:50 +01:00
Rune Strand
137de20cef Remove gradient from btnDanger 2016-02-02 14:30:57 +01:00
Rune Hem Strand
8ce8199820 Merge pull request #1072 from umbraco/temp-U4-7851 
fixes U4-7851 Grid layout RTE formats not being applied.
 2016-02-02 14:14:10 +01:00
Simon Busborg
bb52467f90 Fixes: U4-7703 TinyMCE - can't add additional css via custom config (v7.3.4) 
http://issues.umbraco.org/issue/U4-7703
 2016-02-02 14:08:12 +01:00
Stephan
8791f7ee97 U4-7713 - fix CountPublished 2016-02-02 13:52:55 +01:00
Rune Strand
e9af8bfee1 click in grid RTE format dropdown no longer looses focus from the editor 2016-02-02 13:37:52 +01:00
Shannon
c7a2b54d1c Merge branch '7.3.7' of https://github.com/umbraco/Umbraco-CMS into 7.3.7 2016-02-02 12:13:03 +01:00
Shannon
6583ff4439 U4-7821 KeepUserLoggedIn with a long umbracoTimeOutInMinutes has logout issues 2016-02-02 12:12:51 +01:00
Sebastiaan Janssen
7b08b3e936 Merged branch 7.3.7 into 7.3.7 2016-02-02 11:55:40 +01:00
Sebastiaan Janssen
bd2fc71dc5 U4-7276 When creating folders in the "Partials" view folder a YSOD appears (Umbraco 7.3 and 7.4) 2016-02-02 11:55:24 +01:00
Shannon
0af97f63e2 U4-7857 Flexible Load Balancing does not sync with the correct timeout threshold 2016-02-02 11:11:47 +01:00
Rune Strand
da732359af Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-02 10:18:36 +01:00
Rune Strand
c659e1ff8f Adds button states for hover, focus and active 2016-02-02 10:15:57 +01:00
Simon Busborg
fd92884ce5 Merge pull request #1075 from webprofijt/U4-7687 
Fixes: U4-7687 Create dialog briefly shows 'no allowed document types…
 2016-02-02 08:54:50 +01:00
Shannon
1db635f24c Updates DeepCloneableList to support behaviors, for the FullDataSetCachePolicy we only want to clone when writing to cache, not when reading, the cloning will then be done on individual items after filtering by the FullDataSetRepositoryCachePolicy 2016-02-02 01:32:36 +01:00
Shannon
6e27b3d6d4 Fixes up the FullDataSetRepositoryCachePolicy to handle individual items, updates and removes correctly, splits up it's logic so it's not overriding the DefaultRepositoryCachePolicy since that is just different. Adds tests. 2016-02-02 00:47:18 +01:00
Shannon
1dea0edcf1 re-includes the static cache for published property types, this cache is much more than a simple cache of content type infos, it is also the cache for associated converters which is required for all front-end rendering. Fixes the issue of not setting the xpath cache level corectly. 2016-02-01 22:50:38 +01:00
Shannon
1abab41955 Fixes perf issue with DeepCloneHelper - so we cache the actual property types instead of re-reflecting each time 2016-02-01 21:45:34 +01:00
Claus
2718d895fa Merge pull request #1079 from umbraco/temp-U4-7832 
Fixes: U4-7832 double data bindings
 2016-02-01 15:31:53 +01:00
Mads Rasmussen
f4e6913e6e Fixes: U4-7832 double data bindings 2016-02-01 15:14:38 +01:00
Dave Woestenborghs
647fbea066 Use product name in migration runner instead of Umbraco productname 
Fixes http://issues.umbraco.org/issue/U4-7872
 2016-02-01 11:48:32 +01:00
Sebastiaan Janssen
b69bd8617f Merged branch dev-v7 into dev-v7 2016-02-01 09:28:31 +01:00
Sebastiaan Janssen
924d2a0d88 U4-7669 Update Newtonsoft.Json dependency to v8.0.1 from v6.0.5 
#U4-7669 Fixed
 2016-02-01 09:28:20 +01:00
Claus
17fdc7d246 Merge pull request #1077 from abryukhov/patch-3 
Update UI language ru.xml
 2016-01-31 12:26:12 +01:00
Alexander Bryukhov
10fc60def3 Update UI language ru.xml 
Based on keys added in 7.4 nightly build 155
 2016-01-31 12:05:07 +06:00