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
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
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
Shannon
68a30c3906
fixes issue when referencing a key that doesn't exist
2017-09-12 16:25:12 +10:00
Shannon
65b44137d4
Fixes JS unit test runner
2017-09-12 16:02:40 +10:00
Shannon
81155c2ff8
collate is not supported in sqlce
2017-09-12 15:24:17 +10:00
Shannon
59afcd8be7
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-12 13:38:34 +10:00
Shannon Deminick
41eeb38c5f
Merge pull request #2043 from umbraco/TEMP-u4-10135
...
Added TruncateByWords method + overloads
2017-09-12 13:36:00 +10:00
Shannon
4356d3f94a
publicizes class, fixes up some naming and removes unneeded DirectoryInfo allocations
2017-09-12 13:30:57 +10:00
Shannon Deminick
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
Shannon
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
b884bed7cf
updates db migrations to deal with very rare/old existing tables and indexes along with dealing with non standard collations
2017-09-12 12:43:21 +10:00
Shannon
1f083ca21c
removes the Belle build stuff from the csproj
2017-09-12 12:41:39 +10:00
Shannon
b9ecb7e1d8
updates the upgrade nuget readme
2017-09-12 11:43:54 +10:00
Sebastiaan Janssen
ad8ef56920
Update version
2017-09-11 16:27:43 +02:00
Sebastiaan Janssen
1ff352ddc4
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
2017-09-11 16:24:44 +02:00
Sebastiaan Janssen
f1d3b1a6d3
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2017-09-11 16:23:08 +02:00
Sebastiaan Janssen
45f9919e57
Don't include pdb files in the built zip files
2017-09-11 16:21:51 +02:00
Sebastiaan Janssen
3275f03aff
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
...
# Conflicts:
# .gitignore
# build/UmbracoVersion.txt
# src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2017-09-11 15:46:54 +02:00
Sebastiaan Janssen
857b7cc608
Merge pull request #2003 from umbraco/temp-u4-10006
...
U4-10006 - VSTS/PS migration
2017-09-11 15:43:50 +02:00
Sebastiaan Janssen
c23160f915
Merge remote-tracking branch 'origin/dev-v7' into temp-u4-10006
...
# Conflicts:
# src/Umbraco.Web.UI.Client/test/unit/app/content/edit-content-controller.spec.js
# src/Umbraco.Web.UI.Client/test/unit/app/media/edit-media-controller.spec.js
# src/Umbraco.Web.UI.Client/test/unit/app/propertyeditors/content-picker-controller.spec.js
# src/Umbraco.Web.UI.Client/test/unit/common/services/content-factory.spec.js
2017-09-11 15:08:15 +02:00
Mads Rasmussen
3e3a180fe4
found better check for unit test fixes
2017-09-11 14:35:17 +02:00
Sebastiaan Janssen
c55cf75ada
Use HttpContext from the controller
2017-09-11 13:30:06 +02:00
Mads Rasmussen
fb60647b5a
fix failing unit test: fix karma syntax for spyOn
2017-09-11 12:55:46 +02:00
Sebastiaan Janssen
23950c0cac
U4-10400 Clear CDF temp files during upgrades
2017-09-11 12:22:38 +02:00
Shannon
d808438288
moves the rename menu item above delete (shouldn't be last)
2017-09-11 20:03:50 +10:00
