Shannon
f8d165599d
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-14 18:10:59 +10:00
Stephan
9355a81716
comments
2017-09-14 10:08:35 +02:00
Per Ploug
87575e9067
Reverting grid config
2017-09-14 10:04:04 +02:00
Sebastiaan Janssen
a5b31e94b6
Merge pull request #2194 from umbraco/temp-U4-10409
...
temp - vsts troubleshooting
2017-09-14 09:32:04 +02:00
Shannon
3815a6c607
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-14 16:17:44 +10:00
Shannon Deminick
f9e094a00a
Merge pull request #2193 from gunnim/dev-v7
...
U4-9562 - HealthCheckResolver from internal to public
2017-09-14 15:36:13 +10:00
Gunnar Már Óttarsson
053175a5a6
Fix http://issues.umbraco.org/issue/U4-9562
...
Change HealthCheckResolver to public allowing DI
2017-09-13 19:24:46 +00:00
Stephan
ce7488a924
temp - vsts troubleshooting
2017-09-13 18:23:19 +02:00
Sebastiaan Janssen
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
Sebastiaan Janssen
f442599633
Merge pull request #2191 from umbraco/temp-U4-10409
...
U4-10409 UDI Parsing should not require scanning assemblies
2017-09-13 17:28:33 +02:00
Sebastiaan Janssen
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
Stephan
f1149fb826
U4-10409 - revert unwanted files
2017-09-13 17:20:06 +02:00
Sebastiaan Janssen
3f8f96e8c3
Merge branch 'dev-v7' into temp-U4-10409
2017-09-13 17:18:09 +02:00
Sebastiaan Janssen
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
Sebastiaan Janssen
076a8e0e23
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# src/umbraco.sln
2017-09-13 13:09:20 +02:00
Stephan
44da6c9f97
Merge pull request #2188 from umbraco/temp-U4-10401
...
U4-10401 Being able to rename Data Type folders
2017-09-13 13:08:09 +02:00
Sebastiaan Janssen
a75181bd7f
Update sln to not refer to old build scripts any more
2017-09-13 13:07:22 +02:00
Stephan
058ad9f99a
Merge branch 'dev-v7.7' into temp-U4-10401
2017-09-13 12:12:10 +02:00
Sebastiaan Janssen
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
Sebastiaan Janssen
00b469b61b
Easy ps script to just update the Umbraco version without having to do a full build
2017-09-13 12:07:29 +02:00
Sebastiaan Janssen
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
Sebastiaan Janssen
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
Stephan
ef91e152b4
U4-10409 - udi parsing and assembly scanning
2017-09-13 12:00:56 +02:00
Stephan
add0685d3f
U4-10409 - udi parsing
2017-09-13 09:35:17 +02:00
Shannon
27fc3a9bb3
U4-10409 UDI Parsing should not require scanning assemblies
2017-09-13 14:16:43 +10:00
Shannon Deminick
bbc625f65d
Merge pull request #2190 from abryukhov/temp-U4-10404
...
U4-10404 - v7.7 - added & changed UI localization keys sync for RU language
2017-09-13 09:44:53 +10:00
Alexander Bryukhov
8b34ab24f4
v7.7 - added & changed UI localization keys sync for RU language
2017-09-12 23:54:17 +07:00
Stephan
e8faf54edf
Merge pull request #2187 from umbraco/temp-U4-10118
...
temp u4 10118
2017-09-12 16:05:55 +02:00
Stephan
8548ee7761
u4-10118 - don't create a FS provider manager just to reset it
2017-09-12 16:05:35 +02:00
Claus
ac391f3bcd
Merge branch 'temp-unittests-for-urls' into dev-v7
2017-09-12 15:04:08 +02:00
Claus
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
Shannon
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
Shannon
643d0012c6
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-12 20:22:21 +10:00
Shannon Deminick
5f4985b4eb
Merge pull request #2185 from tomvanenckevort/U4-10184
...
U4-10184 - Fixed string splitting in MultipleTextStringValueConverter.
2017-09-12 20:19:32 +10:00
Sebastiaan Janssen
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
Sebastiaan Janssen
4d7f66736d
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-12 11:41:37 +02:00
Stephan
d179792cc3
perfs - fix IsPublishable silly bug
2017-09-12 11:39:34 +02:00
Sebastiaan Janssen
4cb7b29f60
Try to make build server do the npm/gulp tasks on it's own
2017-09-12 11:20:46 +02:00
Sebastiaan Janssen
fb2f9cea64
Make VSTS responsible for padding the build number
2017-09-12 11:03:56 +02:00
Sebastiaan Janssen
394f21f4be
Make it possible for the build server to set an alpha build version
2017-09-12 10:38:22 +02:00
Claus
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
Robert
7aeed3ae2f
Changed to dataType constant guid
2017-09-12 10:19:31 +02:00
Robert
8269203a47
Added missing "$" and missing rename icon to the DataTypeTreeController
2017-09-12 09:35:15 +02:00
Sebastiaan Janssen
1eea4867af
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-12 09:21:39 +02:00
Sebastiaan Janssen
237b7176bf
I see, we explicitly need to tell MsBuild not to build belle, fine
2017-09-12 09:19:34 +02:00
Tom van Enckevort
1fa2c16668
U4-10184 - Fixed string splitting in MultipleTextStringValueConverter.
2017-09-12 08:15:14 +01:00
Sebastiaan Janssen
63343d89de
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-12 09:05:28 +02:00
Sebastiaan Janssen
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
Sebastiaan Janssen
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
Sebastiaan Janssen
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
