yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,634 Commits 4 Branches 7 Tags
19a4cf774bab19886be75a5a40ffdf89a7e115f7
Commit Graph

2308 Commits

Author SHA1 Message Date
Mads Rasmussen
ab00ba8a12 Merge branch 'dev-v7.6' into temp-U4-9352 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/templates/edit.controller.js
 2017-01-27 10:39:31 +01:00
Warren Buckley
784c84a166 Merge pull request #1474 from umbraco/temp-U4-8963 
U4-8963 Updates for ImageProcessor parameters to support background c…
 2017-01-26 20:45:35 +00:00
Claus
b08e38f9ed Merge branch 'dev-v7.6' into temp-deploy-176 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2017-01-24 09:51:59 +01:00
Warren Buckley
f3e78e990f Fix up failing unit test for the number of Trees found - this has gone down due this test is for implementing interface ITree which is the legacy type of Trees, where the new PartialViews & PartialView Macros now use TreeController 2017-01-20 09:52:23 +00:00
Claus
29d86b8675 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 2017-01-19 12:08:23 +01:00
Claus
4119380af5 U4-9414 EntityContainer repository PerformGetAll query returns nothing 2017-01-19 11:39:09 +01:00
Shannon
c96e017e65 Fixes PocoToSqlExpressionVisitor (oops), fixes examine tests by using the correct usings and NRT indexer/searcher to avoid waiting on thread timers 2017-01-19 14:00:33 +11:00
Sebastiaan Janssen
54e460cf5b U4-9392 Upgrade ImageProcessor with cache header and high CPU fix 
U4-9393 Upgrade to Examine 0.1.80
 2017-01-18 11:47:23 +01:00
Shannon
fd1da492cc fixes range test 2017-01-18 19:18:19 +11:00
Shannon
44732e5f52 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/DatabaseContext.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-01-17 18:21:45 +11:00
Shannon Deminick
d4919ff8c4 Merge pull request #1683 from umbraco/temp-U4-9371 
U4-9371 Examine indexes inherited unpublished nodes on index rebuild …
 2017-01-17 16:34:31 +11:00
Shannon
038b155aea Fixes constants and internalsvisibleto 2017-01-17 14:42:30 +11:00
Shannon
d24541fce4 second commit of everything that we want to add to core for Deploy, have moved stuff to where they should go, probably need to review if the GridValue should be in models though or if we already have this. 2017-01-16 20:45:08 +11:00
Shannon
d2837b9649 Initial commit of all UDI related things and tests, now to import the remaining items tagged for Core 2017-01-16 20:03:59 +11:00
Shannon
3ad729824e Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 2017-01-16 18:08:34 +11:00
Claus
7d4a9998ca U4-9377 It is possible to create/save entities with a blank names by using the services directly 
ensuring that when trying to save an entity with an empty name, directly through a service, an exception will be thrown.
 2017-01-13 11:45:49 +01:00
Shannon
bde439d102 fixes tests 2017-01-13 12:34:58 +11:00
Shannon
ba501dbbb8 U4-9371 Examine indexes inherited unpublished nodes on index rebuild part 2 2017-01-13 10:43:34 +11:00
Shannon
8a11b0f7a8 publisizes a constant (moves it to where it should be), publicizes another required class for deploy, bumps version 2017-01-12 17:33:30 +11:00
Shannon
cfd8d39878 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
#	src/Umbraco.Tests/Umbraco.Tests.csproj
 2017-01-12 13:39:15 +11:00
Stephan
5e6f1a92ca Merge branch origin/dev-v7 into dev-v7.6 2017-01-09 15:31:41 +01:00
Stephan
9ba08f275e Merge branch 'temp-U4-9337' of https://github.com/umbraco/Umbraco-CMS into temp-U4-9337 2017-01-06 09:15:43 +01:00
Stephan
aadd0c9129 U4-9337 - asymmetric route caching 2017-01-06 09:12:25 +01:00
Shannon
b3b79a792f Merge branch 'refs/heads/dev-v7' into temp-U4-9337 2017-01-06 17:40:40 +11:00
Stephan
89be1cf5d2 U4-9337 - with missing file... 2017-01-05 10:50:03 +01:00
Stephan
2041e85b9e U4-9337 - add doc and test 2017-01-05 10:46:40 +01:00
Shannon
8be0f68390 Adds logic to validate an entity's path when it is used to GetDescendants, adds logic to fix an entity's path when it's state is going to be persisted when GetDescendants is used (i.e. MoveToRecycleBin), added this logic to Media too, adds unit tests to support 2017-01-05 10:29:03 +11:00
Stephan
0e31fcf3db U4-9337 - fix tests 2017-01-04 15:36:29 +01:00
Claus
f200ab423d updated test to fail and updated notes. 2017-01-04 11:59:07 +01:00
Shannon
d889d3e385 adds test 2017-01-04 20:00:30 +11:00
Claus
d866f1d74a Merge branch 'dev-v7' into dev-v7.6 2017-01-03 11:58:23 +01:00
Shannon
45fd23ff02 Merge branch 'refs/heads/dev-v7' into temp-U4-9319 2017-01-03 10:36:45 +11:00
Shannon
4e2fb8e5dc Fixes IP nuget references and fixes up several other Nuget assembly references. 2017-01-03 10:36:26 +11:00
Shannon
98430fd573 U4-9326 Removing a master template from a Template does not update the Template's path correctly 2016-12-30 11:42:02 +11:00
Stephan
ef48baf7ae deploy-157 - simplify tables creation in migrations 2016-12-23 10:31:14 +01:00
Stephan
3ac71a37e8 U4-9250 - add more tests 2016-12-22 11:24:01 +01:00
Stephan
f3a7ada586 U4-9250 - add keys to ctors 2016-12-22 11:10:45 +01:00
Shannon
886942c4e8 Updated MacroServiceTests to include testing for the Key 2016-12-22 15:24:54 +11:00
Stephan
7576c8138e U4-9250 - fix tests 2016-12-21 16:47:32 +01:00
Stephan
38e8e1cf9c U4-9250 - fix migration 2016-12-21 15:23:22 +01:00
Stephan
01340e0316 U4-9240 - kill umbracoDeployChecksum 2016-12-20 11:26:34 +01:00
Stephan
467b12491c Merge dev-v7 into dev-v7.6 2016-12-02 12:01:31 +01:00
Stephan
0179540023 Rename WeightAttribute, change default to 100, cleanup 2016-11-24 18:13:05 +01:00
Stephan
5784ea96e7 UnRevert "Backport SafeCallContext, DefaultDatabaseFactory fixes from 7.6" 
This reverts commit 8ba6cb3abf.
 2016-11-23 11:26:30 +01:00
Stephan
a77763ee89 Merge origin/dev-v7 into dev-v7.6 2016-11-23 11:03:52 +01:00
Shannon
8ba6cb3abf Revert "Backport SafeCallContext, DefaultDatabaseFactory fixes from 7.6" 
This reverts commit 59ace3d881.
 2016-11-18 13:38:49 +01:00
Stephan
ddf29c5875 Merge dev-v7.6 into dev-v7-deploy 2016-11-15 13:59:19 +01:00
Stephan
ad82270dcc Merge branch origin/dev-v7 into dev-v7.6 2016-11-15 13:48:01 +01:00
Shannon Deminick
ff499bff04 Merge pull request #1607 from umbraco/temp-u4-backport 
U4-8909 backport from 7.6
 2016-11-15 13:11:05 +01:00
Stephan
2b9ffdb6b9 Merge branch origin/dev-v7 into dev-v7-deploy 2016-11-14 18:53:53 +01:00