Commit Graph

2322 Commits

Author SHA1 Message Date
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
Stephan
539e7c80bf Merge branch origin/dev-v7 into temp-U4-9105 2016-11-14 18:45:56 +01:00
Stephan
2bc07ad4cc Merge branch 'dev-v7' into temp-U4-9105 2016-11-14 18:13:45 +01:00
Sebastiaan Janssen
1c036b1a11 Merge pull request #1562 from umbraco/temp-u4-9136
Temp u4 9136
2016-11-14 18:04:37 +01:00
Sebastiaan Janssen
740abb1426 We don't support C# 6 yet 2016-11-14 16:18:20 +01:00
Sebastiaan Janssen
714b7019c5 Fix unit tests to have the correct types as well 2016-11-14 15:38:50 +01:00
Stephan
8fa1499a2f Merge origin/dev-v7 into dev-v7-deploy 2016-11-04 12:18:39 +01:00
Stephan
74e0a4d999 7.6 merge review fixes 2016-11-03 19:20:42 +01:00
Stephan
59ace3d881 Backport SafeCallContext, DefaultDatabaseFactory fixes from 7.6 2016-11-02 14:26:04 +01:00
Stephan
3a6e2e6735 U4-9136 - rebuild Xml data in a more resilient way 2016-11-02 13:52:58 +01:00
Stephan
958392f09b U4-9105 - bit of cleanup 2016-10-28 16:30:20 +02:00
Shannon
21e2c35ab0 U4-9111 Benchmark BulkCopy changes from U4-9107 2016-10-27 18:03:13 +02:00
Claus
563f8fbdca forgot one :) 2016-10-27 11:07:41 +02:00
Claus
221354a7d8 U4-9104 Update the UmbracoExamine logic for Media to read the data directly from the umbracoXml table.
updated some tests to use the testbehavior attribute so they dont rely on being run in a specific order.
2016-10-27 10:47:32 +02:00
Stephan
c95c4c359a Merge branch 'dev-v7' into temp-U4-9107 2016-10-26 18:03:43 +02:00
Claus
db7c20d99a fixing unit test failing on da-DK culture sorting. 2016-10-26 11:32:25 +02:00
Shannon
dadcbc8b31 U4-9107 Change BulkInsertRecords to use BulkCopy or TableDirect (SQLCE) 2016-10-25 12:29:17 +02:00
Stephan
c58cffe4a2 Add tests for locks 2016-10-25 10:38:38 +02:00
Stephan
e8538cc035 Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy 2016-10-20 12:23:22 +02:00
Sebastiaan Janssen
097f5355e2 U4-9050 Update to latest Examine 0.1.70.0 2016-10-18 18:03:43 +02:00
Stephan
dda988f0ea Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy 2016-10-18 12:25:31 +02:00
Stephan
f1e5b3fcfa Prevent tests from failing due to dates rounding 2016-10-11 15:06:33 +02:00
Shannon
b3e6f0fd22 Merge branch 'refs/heads/dev-v7' into dev-v7-deploy
# Conflicts:
#	src/Umbraco.Core/IO/FileSystemExtensions.cs
2016-10-06 10:35:45 +02:00
Shannon
2cd6427958 Fixes more issues with notifications which weren't sending properly do to a i++ instead of a ++1, have refactored that to read better. Also fixes up performance issues since we were returning every single fully resolved IContent for all versions when all we need is the top 2 version ids, have added methods to do that plus a unit test. Have tested the emails and the diffs and they all work. 2016-10-05 18:30:03 +02:00
Shannon
876f61ac27 U4-8788 ContentService.GetByIds() returns items in different order
U4-8937 ContentController.PostSort is not honouring the passed sorted ids.
2016-10-05 11:20:48 +02:00
Stephan
3fd918d381 Refacetor BackgroundTaskRunner, fix async issues 2016-10-04 14:12:06 +02:00
Stephan
35c7fb60fd Refactor BackgroundTaskRunner, support cancellation of current task 2016-10-03 15:15:51 +02:00
Stephan
e477c8b0b3 Merge branch origin/dev-v7 into dev-v7-deploy 2016-09-29 09:03:56 +02:00
Stephan
37e12cd0be Fix unit tests interferences 2016-09-22 22:18:05 +02:00
Stephan
111a3ca6ac Refactor Shadow FileSystems 2016-09-22 21:45:59 +02:00
Stephan
7176c99264 Merge branch origin/dev-v7 into dev-v7-deploy 2016-09-21 16:03:17 +02:00
Stephan
3ab01a2164 Implement shadow filesystems, IFileSystem2.GetSize 2016-09-21 12:40:29 +02:00
Claus
d725f1362f U4-8984 Upgrade AutoMapper to latest 3.x 2016-09-16 21:23:31 +02:00
Claus
e79427619b Revert "U4-8984 Upgrade AutoMapper to latest 3.x"
This reverts commit 4887302b51.
2016-09-16 21:22:35 +02:00
Claus
4887302b51 U4-8984 Upgrade AutoMapper to latest 3.x 2016-09-16 21:21:14 +02:00
Warren Buckley
aea735f20e Merge pull request #1441 from umbraco/temp-U4-8866
U4-8866 Deleting a parent document type fails if any documents using …
2016-09-16 15:46:50 +01:00