yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,773 Commits 4 Branches 7 Tags
f8fd255239a0fe68296a5a454ffb671d894e245d
Commit Graph

683 Commits

Author SHA1 Message Date
Stephan
a50256d381 Enable trying to convert urls to ascii 2017-06-01 17:58:22 +02:00
Sebastiaan Janssen
7e6f7f8a2b Bumps version 2017-06-01 13:04:31 +02:00
David Peck
1ece576825 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into U4-8550 
Conflicts:
	src/Umbraco.Web.UI/config/umbracoSettings.config
 2017-05-30 23:13:33 +01:00
Stephan
81234cd702 Rename DI to Composing 2017-05-30 15:46:25 +02:00
Stephan
d34a425dd1 porting 7.6@5c5baca into 8 2017-05-30 12:54:22 +02:00
mikkelhm
b0a739b4ac Bump version to 7.6.2 2017-05-29 15:07:37 +02:00
Stephan
8561d85f7a porting 7.6-rc1 into 8 2017-05-24 12:25:39 +02:00
Shannon
38837049f0 adds invite user endpoint with a controller test! 2017-05-24 19:01:01 +10:00
Shannon
fc58c4f546 bumps version updates a few methods 2017-05-10 18:06:46 +10:00
AndyButland
712cd29fea Upload checks to utilise whitelist. Refactored check on white and black list to common extension method. 2017-05-09 23:29:30 +02:00
AndyButland
3d21448f89 Validated file uploads using white list if provided, before falling back to blacklist 2017-05-09 18:12:51 +02:00
mikkelhm
36e60c774f Bump version to 7.6.1 2017-05-08 14:06:03 +02:00
Shannon
c1853e8c51 bumps version to 7.6.0 rtm 2017-05-02 13:42:20 +10:00
Shannon
d9b507c947 bumps version to RC4 so we can build new dependencies against forms/deploy 2017-04-30 23:26:04 +10:00
Shannon
9f505a7976 bumps to rc3 version 2017-04-28 08:27:31 +10:00
Shannon
944b3dcaac New method for IPackagingService to fetch a package from the repo, removes usages of the old repo endpoint, removes ability to push a package from the back office to Our since that would require a different endpoint. 2017-04-26 19:02:36 +10:00
Shannon
a6f9d14a1b Merge remote-tracking branch 'origin/dev-v7.6' into temp-CON-1267 2017-04-26 14:18:05 +10:00
Shannon
bfb81f6362 Allows for the umb pckage repo rest api endpoint to be configurable - for testing 2017-04-26 14:04:47 +10:00
mikkelhm
4775aff749 Bump version to RC2 2017-04-25 11:15:51 +02:00
Shannon
d295174e53 Updates JS to include the current umbraco version when requesting a package's details, updates the c# to use a new endpoint on OUR to ensure that the correct file is downloaded based on the umb version passed in. 2017-04-24 21:31:35 +10:00
Shannon
bec4e442fb bumps to RC1 2017-04-21 17:45:27 +10:00
Sebastiaan Janssen
0e67c787a8 Bump version to RC :) 2017-04-04 08:05:32 +02:00
Shannon
ebfb2b536f bumps version to RC01 2017-04-04 13:12:03 +10:00
Sebastiaan Janssen
2daf71aee4 Move LoginBackgroundImage to the content section instead of the security section 2017-03-30 11:15:12 +02:00
Sebastiaan Janssen
339edb2295 Merge branch 'dev-v7.6' into temp-U4-9687 2017-03-30 10:49:03 +02:00
Emil Wangaa
d51082f651 Bumps version 2017-03-30 10:27:54 +02:00
Niels Hartvig
a409b8b0f7 Adds server side support for configuring a background photo for login screen 2017-03-29 12:49:06 +02:00
mikkelhm
bfd201efcc Bump version to 7.6-Beta5 2017-03-23 15:46:18 +01:00
Shannon
ed0f0f7942 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	src/Umbraco.Core/Configuration/CoreDebug.cs
#	src/Umbraco.Core/Publishing/PublishingStrategy.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
 2017-03-23 12:24:16 +11:00
Emil Wangaa
1e154e8bc9 Internal Beta04 version bump - needed for Forms 2017-03-22 14:32:35 +01:00
Warren Buckley
7b1efa718e Internal Beta03 version bump - needed for Forms for access to [FileUploadCleanupFilter] 2017-03-21 15:50:13 +00:00
Warren Buckley
ac496b0cf6 Updates version to beta02 - after Warren forgot to merge & push AccessToInternals for Forms before public beta 2017-03-20 15:40:15 +00:00
Sebastiaan Janssen
c79aaa9c48 Bumps version 2017-03-17 11:49:42 +01:00
Stephan
e432b7061d U4-9606 - New DumpOnTimeoutThreadAbort debug option 2017-03-14 19:02:33 +01:00
Shannon
df04100ff6 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.Core/Persistence/Querying/ExpressionVisitorBase.cs
#	src/Umbraco.Core/Persistence/Querying/SqlExpressionExtensions.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
 2017-03-10 10:40:28 +01:00
Stephan
6992b0319a Version 7.6-alpha074 2017-03-08 18:59:27 +01:00
Shannon Deminick
1722831bf5 Merge pull request #1640 from umbraco/temp-u4-7318 
Value Converters for All Core Property Editors
 2017-03-08 14:29:40 +01:00
Shannon
5291558b23 Further refactoring, using attributes, moving and removing some classes, using DI where necessary. 2017-03-08 14:27:39 +01:00
Warren Buckley
a3f6fb78f5 Bump version to alpha-73 after downgrade to .NET 4.5 2017-03-08 12:22:47 +00:00
Claus
31d980b0c5 Merge pull request #1782 from umbraco/temp-u4-9605 
U4-9605 - debug switch for uncompleted scopes
 2017-03-08 13:07:03 +01:00
Warren Buckley
5218d31f23 Bumps version to alpha-072 2017-03-07 15:43:29 +00:00
Stephan
9e55f5835c U4-9605 - debug switch for uncompleted scopes 2017-03-07 12:42:44 +01:00
mikkelhm
589704437f Bump version to alpha071 2017-03-02 15:46:06 +01:00
mikkelhm
32ad98cde2 Bump version to alpha070 2017-03-02 13:33:12 +01:00
Shannon
a9c5877e5b Merge branch 'refs/heads/dev-v7.6' into temp-u4-7318 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-03-01 15:04:00 +01:00
Shannon
337ba4ef34 U4-9577 Ability to store the xml content file in diff storage locations: Default, Environment Temp or ASP.NET temp location 2017-02-28 23:53:12 +01:00
mikkelhm
a39557a3a7 Bump version to alpha068 2017-02-24 12:31:59 +01:00
Sebastiaan Janssen
0b9a3ef68a Bump version 2017-02-22 10:26:37 +01:00
Stephan
f61b7579a2 Version 7.6-alpha066 2017-02-21 17:13:34 +01:00
Sebastiaan Janssen
52dce66598 Bump version 2017-02-21 08:49:34 +01:00