Commit Graph

17285 Commits

Author SHA1 Message Date
Shannon
95187becaf bumps to next alpha for MyGet 2017-01-03 11:50:29 +11:00
Shannon
790e30defd Simplifies all creation of UrlHelper, creates GetUmbracoApiServiceBaseUrl extensions for WebApi 2017-01-03 11:13:38 +11:00
Shannon
ee925692e5 Bumps version to put on MyGet 2016-12-30 16:06:40 +11:00
Shannon
0832220d61 publicizes some APIs needed for Deploy 2016-12-30 12:07:03 +11:00
Shannon
903ce09426 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.Web.UI/Umbraco.Web.UI.csproj
2016-12-29 13:57:55 +11:00
Shannon
ffefe417db bumps version 2016-12-29 12:23:30 +11:00
Shannon
40f7d820a6 publicizes a few APIs and adds more API docs 2016-12-29 11:36:39 +11:00
Shannon
d83d23803a fixes build 2016-12-28 19:11:45 +11:00
Shannon
fae5dd517e bumps version to next alpha 2016-12-28 18:57:25 +11:00
Shannon
247c96ac6e makes public the MigrationBase.Context property 2016-12-28 17:22:36 +11:00
Shannon Deminick
360e06bbc5 Merge pull request #1660 from umbraco/deploy-157
deploy-157 - simplify tables creation in migrations
2016-12-28 15:51:04 +11:00
Mikkel Holck Madsen
2d94ac7a19 Merge pull request #1658 from umbraco/temp-U4-9199
Fixes: U4-9199 Grid RTE (rich text editor/ tinyMCE) does not have a m…
2016-12-27 14:45:42 +01:00
Stephan
ef48baf7ae deploy-157 - simplify tables creation in migrations 2016-12-23 10:31:14 +01:00
Shannon
8e06a88a2c bumps version, publicizes method 2016-12-23 14:52:18 +11:00
Shannon Deminick
6898d9b270 Merge pull request #1657 from umbraco/temp-u4-9250
U4-9250 - Guid all the Macros
2016-12-23 10:24:12 +11:00
Shannon
0aa8a5c243 more whitespace fixing 2016-12-23 09:41:23 +11:00
Shannon
c5326fc5c9 fixes whitespace in version file 2016-12-23 09:31:54 +11:00
Mads Rasmussen
4c97c689e9 Fixes: U4-9199 Grid RTE (rich text editor/ tinyMCE) does not have a max height, causing the user to have to scroll up to see RTE menu buttons 2016-12-22 14:06:23 +01:00
Stephan
9431e878f3 Version 7.6.0-alpha035 2016-12-22 11:34:33 +01:00
Stephan
3ac71a37e8 U4-9250 - add more tests 2016-12-22 11:24:01 +01:00
Stephan
0ac5e0daf4 U4-9250 - rename GetAllAll method - yea that was bad 2016-12-22 11:14:09 +01:00
Stephan
f3a7ada586 U4-9250 - add keys to ctors 2016-12-22 11:10:45 +01:00
Shannon
bd4f3ad0d9 bumps umb version so the build works. 2016-12-22 18:44:47 +11:00
Shannon
8083edddb9 Adds check to DetermineInstalledVersion to detect if it's 7.6 based on the new DB changes 2016-12-22 16:36:25 +11: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
b3a6c70ae7 U4-9250 - revert some changes 2016-12-21 15:34:17 +01:00
Stephan
ef28173511 U4-9250 - fixes 2016-12-21 15:23:23 +01:00
Stephan
b25cb9995f U4-9250 - Guid the IMacroService 2016-12-21 15:23:22 +01:00
Stephan
38e8e1cf9c U4-9250 - fix migration 2016-12-21 15:23:22 +01:00
Stephan
f25641b2a7 U4-9250 - Guid all the Macros 2016-12-21 15:23:22 +01:00
Sebastiaan Janssen
c88ee55e8d Merge pull request #1656 from umbraco/temp-u4-9240
U4-9240 - kill umbracoDeployChecksum
2016-12-21 09:14:10 +01:00
Sebastiaan Janssen
f2f4c23c80 Merge pull request #1652 from umbraco/U4-9301
Updates login controller to not accept non local urls
2016-12-20 13:55:31 +01:00
Stephan
01340e0316 U4-9240 - kill umbracoDeployChecksum 2016-12-20 11:26:34 +01:00
Claus
67ea15706e Merge pull request #1651 from umbraco/temp-U4-9282
U4-9282 Rollback not working
2016-12-20 11:24:05 +01:00
Claus
5cc75b8cc3 Merge pull request #1654 from umbraco/temp-U4-9302
U4-9302 Add logging of non security related connection string details…
2016-12-20 11:01:50 +01:00
Claus
653ac66ff3 Merge pull request #1653 from umbraco/temp-U4-9262
U4-9262 CleanForXss breaks rgba() values set as grid background color…
2016-12-20 10:32:36 +01:00
Shannon
3f7e593bc2 U4-9302 Add logging of non security related connection string details when the connection fails 2016-12-20 14:10:06 +11:00
Shannon
39505cd868 U4-9262 CleanForXss breaks rgba() values set as grid background color style 2016-12-20 13:27:53 +11:00
Shannon
0daaa3e785 Revert "Merge pull request #1618 from AliSheikhTaheri/U4-9180"
This reverts commit 4050a375bc, reversing
changes made to a058f26462.
2016-12-20 12:28:45 +11:00
Shannon Deminick
4050a375bc Merge pull request #1618 from AliSheikhTaheri/U4-9180
U4-9180 Optimise Log4net
2016-12-20 11:08:11 +11:00
Niels Hartvig
da27108d0d Updates login controller to not accept non local urls 2016-12-19 10:44:22 +01:00
hartvig
a058f26462 Update README.md 2016-12-19 09:20:21 +01:00
Shannon
c8f0f05570 U4-9246 Should ship with numRecompilesBeforeAppRestart="50" to avoid max recompilations reached errors 2016-12-19 17:10:29 +11:00
Shannon
347ed2896a U4-9282 Rollback not working 2016-12-19 16:58:24 +11:00
Shannon
5c40a1f9e9 bumps version 2016-12-19 16:42:05 +11:00
Shannon
7254db40eb publicizes ExamineExtensions.ConvertSearchResultToPublishedContent 2016-12-15 17:44:32 +11:00
Shannon
04481c33e7 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-12-15 10:45:57 +11:00
Shannon
4c107470c3 updates some angular docs 2016-12-15 10:43:53 +11:00
Stephan
4863052a08 Revert "deploy-11 - implement DeployVersionAttribute"
This reverts commit f51a086137.
2016-12-13 10:58:19 +01:00