f8d165599d
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-14 18:10:59 +10:00
9355a81716
comments
2017-09-14 10:08:35 +02:00
87575e9067
Reverting grid config
2017-09-14 10:04:04 +02:00
a5b31e94b6
Merge pull request #2194 from umbraco/temp-U4-10409
...
temp - vsts troubleshooting
2017-09-14 09:32:04 +02:00
3815a6c607
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-14 16:17:44 +10:00
053175a5a6
Fix http://issues.umbraco.org/issue/U4-9562
...
Change HealthCheckResolver to public allowing DI
2017-09-13 19:24:46 +00:00
ce7488a924
temp - vsts troubleshooting
2017-09-13 18:23:19 +02:00
6cd2a15964
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# src/Umbraco.Core/UdiEntityType.cs
2017-09-13 17:34:35 +02:00
37b6b42570
Merge branch 'temp-U4-10409' of https://github.com/umbraco/Umbraco-CMS into temp-U4-10409
2017-09-13 17:20:49 +02:00
f1149fb826
U4-10409 - revert unwanted files
2017-09-13 17:20:06 +02:00
3f8f96e8c3
Merge branch 'dev-v7' into temp-U4-10409
2017-09-13 17:18:09 +02:00
8ebbfca17d
Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7
2017-09-13 13:15:28 +02:00
076a8e0e23
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# src/umbraco.sln
2017-09-13 13:09:20 +02:00
a75181bd7f
Update sln to not refer to old build scripts any more
2017-09-13 13:07:22 +02:00
058ad9f99a
Merge branch 'dev-v7.7' into temp-U4-10401
2017-09-13 12:12:10 +02:00
dd440eb9d5
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# src/Umbraco.Core/Services/ContentService.cs
# src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
2017-09-13 12:09:17 +02:00
83f08538c2
U4-10407 We should log unhandled exceptions that occur in webapi controllers and always have detailed errors returned to users even when not in debug mode
...
# Conflicts:
# src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
2017-09-13 12:05:02 +02:00
aafe0e1c6c
Merge pull request #2189 from umbraco/temp-U4-10407
...
U4-10407 We should log unhandled exceptions that occur in webapi controllers and always have detailed errors returned to users even when not in debug mode
2017-09-13 12:04:29 +02:00
ef91e152b4
U4-10409 - udi parsing and assembly scanning
2017-09-13 12:00:56 +02:00
add0685d3f
U4-10409 - udi parsing
2017-09-13 09:35:17 +02:00
27fc3a9bb3
U4-10409 UDI Parsing should not require scanning assemblies
2017-09-13 14:16:43 +10:00
8b34ab24f4
v7.7 - added & changed UI localization keys sync for RU language
2017-09-12 23:54:17 +07:00
e8faf54edf
Merge pull request #2187 from umbraco/temp-U4-10118
...
temp u4 10118
2017-09-12 16:05:55 +02:00
8548ee7761
u4-10118 - don't create a FS provider manager just to reset it
2017-09-12 16:05:35 +02:00
0700e37830
adding unit tests for urls.
...
adding unit test for creating child content without identity.
cleaning up some usings ...
2017-09-12 14:44:01 +02:00
7a71f64978
U4-10407 We should log unhandled exceptions that occur in webapi controllers and always have detailed errors returned to users even when not in debug mode
2017-09-12 21:54:55 +10:00
643d0012c6
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-12 20:22:21 +10:00
5f4985b4eb
Merge pull request #2185 from tomvanenckevort/U4-10184
...
U4-10184 - Fixed string splitting in MultipleTextStringValueConverter.
2017-09-12 20:19:32 +10:00
14ff7cbcc7
Comment out tests that are described in the file not to be working - so build server doesn't fail
2017-09-12 12:18:06 +02:00
4d7f66736d
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-12 11:41:37 +02:00
d179792cc3
perfs - fix IsPublishable silly bug
2017-09-12 11:39:34 +02:00
32cd9d44cb
Merge pull request #1831 from leekelleher/issue/U4-9678
...
Fixes U4-9678 - XPath Syntax Parser slowdown
2017-09-12 10:19:36 +02:00
7aeed3ae2f
Changed to dataType constant guid
2017-09-12 10:19:31 +02:00
8269203a47
Added missing "$" and missing rename icon to the DataTypeTreeController
2017-09-12 09:35:15 +02:00
1eea4867af
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-12 09:21:39 +02:00
237b7176bf
I see, we explicitly need to tell MsBuild not to build belle, fine
2017-09-12 09:19:34 +02:00
1fa2c16668
U4-10184 - Fixed string splitting in MultipleTextStringValueConverter.
2017-09-12 08:15:14 +01:00
63343d89de
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-12 09:05:28 +02:00
1c5e2b5f73
No need for UmbracoBuild=True - the build scripts already manually build Belle once, this would just cause it to run again during MSBuild
2017-09-12 09:02:57 +02:00
26cce02984
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# src/Umbraco.Web.UI.Client/test/config/karma.conf.js
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2017-09-12 08:52:10 +02:00
30af8cb928
Only build Belle when UmbracoBuild is set (from powershell input), lib folder doesn't exist or on rebuild
2017-09-12 08:47:36 +02:00
9fd0e7771d
Rename logic in place
2017-09-12 08:28:18 +02:00
68a30c3906
fixes issue when referencing a key that doesn't exist
2017-09-12 16:25:12 +10:00
65b44137d4
Fixes JS unit test runner
2017-09-12 16:02:40 +10:00
81155c2ff8
collate is not supported in sqlce
2017-09-12 15:24:17 +10:00
59afcd8be7
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-12 13:38:34 +10:00
41eeb38c5f
Merge pull request #2043 from umbraco/TEMP-u4-10135
...
Added TruncateByWords method + overloads
2017-09-12 13:36:00 +10:00
4356d3f94a
publicizes class, fixes up some naming and removes unneeded DirectoryInfo allocations
2017-09-12 13:30:57 +10:00
ba072aec7c
Merge pull request #2183 from umbraco/temp-U4-10400
...
U4-10400 Clear CDF temp files during upgrades
2017-09-12 13:26:41 +10:00
68f1120b4f
U4-10118 Umbraco.Core.IO.FileSystemProviderManager is simply not testable and cannot be properly used or setup in tests
2017-09-12 13:18:34 +10:00
Shannon