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

6512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
dcde00cec1 Merge pull request #213 from leekelleher/U4-3452 
Fixes: U4-3452 Update the MIT License URL (Packager)
 2013-12-29 05:58:02 -08:00
Sebastiaan Janssen
bcc70f7a1e Merge pull request #197 from mkariti/u4-415 
U4-415
 2013-12-29 05:39:30 -08:00
Sebastiaan Janssen
32bc2f1d69 merge ismailmayat-UK-Festival 2013-12-29 14:34:54 +01:00
Sebastiaan Janssen
4d3f67885a Fixes U4-1076 Apostrophes in document type description are shown preceded/escaped by a slash in the Create Node dialog 2013-12-29 14:12:23 +01:00
Sebastiaan Janssen
a269e9d426 Merge branch 'BatJan-master' into 6.2.0 2013-12-29 13:51:54 +01:00
Sebastiaan Janssen
af5a382f93 Merge branch 'master' of https://github.com/BatJan/Umbraco-CMS into BatJan-master 2013-12-29 13:51:18 +01:00
Sebastiaan Janssen
dad910b8ab Merge pull request #212 from mattbrailsford/6.2.0-1004 
Added ValidateRequest="false" on package installer page to allow user co...
 2013-12-28 03:50:10 -08:00
Shannon
8a70c440f2 Added many more unit tests for the membership provider base class and fixed some logic inconsistencies. 2013-12-28 18:55:43 +11:00
Shannon
fbdb1d5d6c Fixes: U4-3942 Cannot configure the request if there is not content assigned - exception 
Conflicts:
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-12-28 14:01:08 +11:00
Shannon
edaa5ebd43 Lots more unit tests for the membership providers and some other fixups - have a new failing test as i need to sort out salting issue with encrypted passwords. 2013-12-24 14:03:18 +11:00
Shandem
c12b270511 Merge pull request #268 from james-melville/6.2.0 
Fixes: U4-3814 - 6.1.6 XSS vulnerability in backoffice
 2013-12-23 16:14:52 -08:00
Shannon
c8fa2b3880 Merge branch 'abjerner-patch-1' into 6.2.0 
Conflicts:
	src/Umbraco.Web/PublishedContentExtensions.cs
 2013-12-24 11:08:48 +11:00
Shannon
1c139b685a updates legacy membership provider to use efficient paging. 2013-12-20 18:12:54 +11:00
Shannon
7a8b3dc9bc Updated the member service/repo to have paged queries and results which use db paging for maximum efficiency (of course only works for things like email, username but those are 2 specific things that are needed by the membership provider) 2013-12-20 18:11:12 +11:00
Shannon
a4dde1948f Implements the member count methods on the member service and adds unit tests. 2013-12-20 16:20:32 +11:00
Shannon
0f68818a19 Updated member service with the newer property value queries and added unit tests for all of them 2013-12-20 15:44:53 +11:00
Shannon
414b65b269 More WIP on the membership providers - both new and old. They are now both working with the same up-to-date logic and base classes. Updated the interface definitions on the member services to support the membership provider queries - now to implement the logic. 2013-12-20 14:01:10 +11:00
Shannon
2dd04799b2 WIP membership provider updates 2013-12-19 18:33:25 +11:00
Shandem
c589c741e8 Merge pull request #220 from leekelleher/U4-2006 
Fixes: U4-2006 Domain.GetDomain(string DomainName) is case-sensitive
 2013-12-18 20:56:03 -08:00
Shandem
c8923cbc27 Merge pull request #221 from AnthonyCogworks/U4-2272 
Replaced HttpContext.Current.Cache with HttpRuntime.Cache
 2013-12-18 20:54:57 -08:00
Shandem
063f405a06 Merge pull request #230 from Yawka/U4-2772 
U4 2772
 2013-12-18 20:51:17 -08:00
Shandem
addfbcf2a7 Merge pull request #232 from Yawka/U4-2034 
U4 2034
 2013-12-18 20:48:52 -08:00
Shandem
8ee133bb75 Merge pull request #239 from OptimisticCoder/U4-451 
U4-451 Inconsistent line endings in template files created by Umbraco
 2013-12-18 20:46:46 -08:00
Shandem
fa1185cbd8 Merge pull request #241 from OptimisticCoder/U4-3039 
U4-3039 Import Document Type leaves files in App_Data
 2013-12-18 20:43:15 -08:00
Shandem
68e0a414a0 Merge pull request #245 from esn303/patch-1 
Fixed minor typos
 2013-12-18 20:39:43 -08:00
Shandem
89860bd786 Merge pull request #261 from esunxray/patch-1 
Update zh.xml
 2013-12-18 20:26:48 -08:00
Shandem
b5cfefa052 Merge pull request #265 from Jeavon/U4-3247 
Fixes U4-3247 - TinyMce v3 doesn't work with IE11
 2013-12-18 20:22:19 -08:00
Shannon
b2c0f3c35a some file formatting 2013-12-19 15:21:02 +11:00
Shannon
a43f4b7b7f Completes: U4-1521 Updated back office to use ClientDependency bundles for common files 2013-12-19 15:05:05 +11:00
Shandem
7ce3949852 Merge pull request #209 from ProNotion/U4-1521 
U4 1521
 2013-12-18 18:37:02 -08:00
Shandem
4862419744 Merge pull request #198 from craigacronin/U4-1891 
Fixed as per issue comments, but also implemented for another 3 overload...
 2013-12-18 18:33:57 -08:00
Shannon
6b810c89f6 un-ignores PublishedContentExtensionTests 2013-12-19 13:28:17 +11:00
Shandem
89b0a2fd89 Merge pull request #170 from lars-erik/6.2.0_fix_publishedcontentextensiontests_sidebysidefriendly 
Should make the PublishedContentExtensionTests green when ran together w...
 2013-12-18 18:25:38 -08:00
Shannon
8aceae9880 re-formats some code, simplifies calls using InvariantEquals extension method 2013-12-19 13:22:33 +11:00
Shandem
384d4d60f1 Merge pull request #168 from stevetemple/6.1.6-multiple-action-route-issue 
Fix error when multiple routes have the same controller
 2013-12-18 18:18:44 -08:00
Shannon
67caf81a74 adds a couple of null checks. 2013-12-19 13:14:38 +11:00
Shannon
763ab26446 Updates packaging service to not export empty properties. 2013-12-19 13:13:13 +11:00
Shannon
67a8fa5f07 Merge branch 'wtct-U4-3091' into 6.2.0 2013-12-19 13:05:27 +11:00
Shannon
5c59317bf8 changes casing of col names 2013-12-19 12:52:37 +11:00
Shannon
a2ec53dd4f Merge branch 'wtct-U4-3071' into 6.2.0 2013-12-19 12:50:42 +11:00
Shannon
db78c78df2 fixes some merge issues with view engine wrapping PR. 2013-12-19 12:45:46 +11:00
Shannon
4558549d5a Fixes appendformat issue 2013-12-19 12:40:41 +11:00
Shannon
d98801d5d1 Merge branch '6.2.0' of https://github.com/mortenbock/Umbraco-CMS into mortenbock-6.2.0 
Conflicts:
	src/Umbraco.Web/WebBootManager.cs
 2013-12-19 12:35:33 +11:00
Shandem
de9ecf6afc Merge pull request #143 from IDisposable/patch-1 
Added contextualKeyBuilder optional argument to allow the key used for cachin...
 2013-12-18 17:32:26 -08:00
Shandem
702790bf77 Merge pull request #144 from IDisposable/patch-2 
Make CacheHelperExtensions public so we can call CachedPartialView and C...
 2013-12-18 17:30:01 -08:00
Shannon
c912e80134 modified media service tests to not have to create data in teh base tests 2013-12-19 12:27:21 +11:00
Shannon
098c856138 Merge branch '6.2.0' of https://github.com/sniffdk/Umbraco-CMS into sniffdk-6.2.0 
Conflicts:
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-12-19 12:11:33 +11:00
Shannon
b45306e1ff Merge branch '6.2.0' of https://github.com/dprothero/Umbraco-CMS into dprothero-6.2.0 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2013-12-19 11:59:22 +11:00
Shannon
3499f39970 Merge branch 'kipusoep-patch-1' into 6.2.0 2013-12-19 11:49:30 +11:00
Shannon
9115aa1a6d merge issue with proj file 2013-12-19 11:46:31 +11:00