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

1008 Commits

Author SHA1 Message Date
Shannon
0a26eccd2d Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Security/AuthenticationExtensions.cs
	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
	src/Umbraco.Core/Security/UserData.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
	src/umbraco.cms/businesslogic/datatype/DefaultData.cs
	src/umbraco.sln
 2013-08-07 10:29:34 +10:00
Shannon
ec0e5107ea Ensures all controller names are consistent. 2013-08-06 14:24:30 +10:00
Per Ploug Krogslund
319da4816a replaces scriptLoader references with assetsService 2013-08-05 14:16:04 +02:00
Shannon
ab594db5fc Got the media tree converted to new tree structure. 2013-08-05 19:22:00 +10:00
Shannon
c4b44ea0e3 Fixes: U4-2577 Can't save umbraco user - without re-filling in the password 
Fixes: U4-541 Wrong dictionary key when using in backend template names
This changes the way that the value that is stored in the auth cookie. Previously we just stored a GUID which was the user's contextid stored in the db, now we store encrypted values of a few necessary user objects. In 6.2 we'll actually set a real .Net user object on the HttpContext. For now, the http module will simply just ensure that the culture is set correctly for the currently logged in user.
 2013-08-02 15:16:04 +10:00
Sebastiaan Janssen
898d25f3cb Include lang files in project so they'll actually end up in the final build 2013-07-31 18:31:39 +02:00
Shannon
66c2157bea Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/UriExtensions.cs
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/MediaController.cs
	src/Umbraco.Web/Install/UmbracoInstallAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoApiController.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
 2013-07-31 18:52:14 +10:00
Shannon
6f464567bb Implements real FormsAuthentication for back office cookie authentication... finally :) 2013-07-31 17:08:56 +10:00
Shannon
2bbc610550 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-07-30 13:29:21 +10:00
Shannon
b3b2b5b9ee Implemented much more of the new tree api structure. Have converted most of the content tree over to use it. 2013-07-30 13:29:05 +10:00
Per Ploug Krogslund
f9f54b3ee7 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/services/util.service.js
	src/Umbraco.Web.UI.Client/src/routes.js
 2013-07-28 01:01:50 +02:00
Per Ploug Krogslund
0877a69a3e Removed trailing space from ngdoc declaration 2013-07-28 00:41:28 +02:00
Sebastiaan Janssen
f50de5b049 U4-2550 Could not load file or assembly 'HtmlAgilityPack, Version=1.4.5.0 2013-07-26 15:16:55 +02:00
Sebastiaan Janssen
d734ba6136 U4-2543 In the back office its possible to get Response Validation errors 2013-07-26 12:43:19 +02:00
Sebastiaan Janssen
e41d3c7e84 Increase version to 6.1.4 2013-07-25 11:59:37 +02:00
Shannon
118f9b02e2 Fixes: U4-1027 Media Sort Usability -> changed the sorting to use Web API instead of asmx web service. 2013-07-25 12:29:41 +10:00
Shannon
500d25fd5a Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
 2013-07-24 13:10:43 +10:00
Shannon
ffff9efaa8 Fixes: U4-2535 The actions/publish.aspx page does not publish correctly and show the correct publish result 2013-07-24 13:06:25 +10:00
Shannon
7f4abb4893 Fixed editContent.aspx to let the business logic handle the property validation when trying to publish and show the correct status message result (if it was not publishable). Adds the invalid properties collection to the PublishStatus so those can be shown too. 2013-07-24 12:54:10 +10:00
Shannon
4d39ce1202 Fixes Allow At Root styling 2013-07-24 11:44:26 +10:00
Shannon
5dc43e99fa Got media controllers working just like content, have tried to share as much code as possible between them. Can probably do a bit better but there's minimal code replication. 2013-07-23 18:55:31 +10:00
Shannon
53891a69af Fixed up the media uploader property editor so that it doesn't store any json, this leaves it as fully backwards compatible with 6.x < but also still allows us to upload multiple images if we want. 2013-07-23 16:43:08 +10:00
Shannon
4df80eb976 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-07-23 13:41:42 +10:00
Shannon
d657f2c3cb Gets the back office routing to /umbraco again. 2013-07-23 13:33:37 +10:00
Sebastiaan Janssen
398bc6d767 Fix merge issue 2013-07-22 12:15:54 +02:00
Sebastiaan Janssen
5d3ef8d97f Merge branch '6.1.3' of https://github.com/Myster/Umbraco-CMS into Myster-6.1.3 
Conflicts:
	src/Umbraco.Web.UI/umbraco/config/lang/de.xml
	src/Umbraco.Web.UI/umbraco/config/lang/no.xml
 2013-07-22 12:09:41 +02:00
Shannon
b565a3468b Moves larger util classes to their own files, fixes up the notification service to ensure notifications go away properly. 2013-07-22 18:40:02 +10:00
Sebastiaan Janssen
845770c4bb Merge pull request #69 from abryukhov/patch-2 
tinyMCE internal language pack - RU
 2013-07-22 00:05:22 -07:00
Sebastiaan Janssen
771dc10c85 Merge pull request #68 from abryukhov/patch-3 
tinyMCE internal language pack - RU
 2013-07-22 00:04:23 -07:00
Sebastiaan Janssen
2ac76202e5 Merge pull request #67 from abryukhov/patch-4 
tinyMCE internal language pack - RU
 2013-07-22 00:04:11 -07:00
Sebastiaan Janssen
a5ecbe96e2 Merge pull request #66 from abryukhov/patch-5 
tinyMCE internal language pack - RU
 2013-07-22 00:04:03 -07:00
Sebastiaan Janssen
7240b22e48 Merge pull request #65 from abryukhov/patch-6 
tinyMCE internal language pack - RU
 2013-07-22 00:03:51 -07:00
Sebastiaan Janssen
1f00589cb4 Merge pull request #64 from abryukhov/patch-7 
tinyMCE internal language pack - RU
 2013-07-22 00:03:33 -07:00
Sebastiaan Janssen
60b14487a9 Merge pull request #63 from abryukhov/patch-8 
tinyMCE internal language pack - RU
 2013-07-22 00:03:24 -07:00
Sebastiaan Janssen
33bc85a843 Merge pull request #62 from abryukhov/patch-9 
tinyMCE internal language pack - RU
 2013-07-22 00:03:14 -07:00
Sebastiaan Janssen
e6642674d4 Merge pull request #61 from abryukhov/patch-10 
tinyMCE internal language pack - RU
 2013-07-22 00:03:01 -07:00
Sebastiaan Janssen
8ad5fb3c44 Merge pull request #60 from abryukhov/patch-11 
tinyMCE internal language pack - RU
 2013-07-22 00:02:50 -07:00
Sebastiaan Janssen
1752d14c57 Merge pull request #59 from abryukhov/patch-12 
tinyMCE internal language pack - RU
 2013-07-22 00:02:40 -07:00
Sebastiaan Janssen
ec4ccba1a7 Merge pull request #58 from abryukhov/patch-13 
tinyMCE internal language pack - RU
 2013-07-22 00:02:32 -07:00
Sebastiaan Janssen
0244492a89 Merge pull request #57 from abryukhov/patch-14 
tinyMCE internal language pack - RU
 2013-07-22 00:02:22 -07:00
Sebastiaan Janssen
546cf2c84d Merge pull request #56 from abryukhov/patch-15 
tinyMCE internal language pack - RU
 2013-07-22 00:02:14 -07:00
Sebastiaan Janssen
d354dde774 Merge pull request #55 from abryukhov/patch-16 
tinyMCE internal language pack - RU
 2013-07-22 00:02:03 -07:00
Alexander Bryukhov
5dd14723e9 tinyMCE internal language pack - RU 2013-07-22 10:29:12 +07:00
Alexander Bryukhov
7134e80c44 tinyMCE internal language pack - RU 2013-07-22 10:27:31 +07:00
Alexander Bryukhov
f7196ee8f9 tinyMCE internal language pack - RU 2013-07-22 10:26:47 +07:00
Alexander Bryukhov
fdecd697b7 tinyMCE internal language pack - RU 2013-07-22 10:26:04 +07:00
Alexander Bryukhov
6c03dac869 tinyMCE internal language pack - RU 2013-07-22 10:25:18 +07:00
Alexander Bryukhov
6cdb564a9f tinyMCE internal language pack - RU 2013-07-22 10:24:31 +07:00
Alexander Bryukhov
0da8a8db36 tinyMCE internal language pack - RU 2013-07-22 10:23:51 +07:00
Alexander Bryukhov
a4a9620889 tinyMCE internal language pack - RU 2013-07-22 10:22:46 +07:00