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

6529 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
17883358b6 Fixes some issues with the User membership provider, updates user create dialog to also have an email address (which is required by membership), adds validation to the member and user create dialogs to ensure that the email address is validated to be a correcty formatted address. 2014-01-02 14:13:43 +11:00
Shannon
fc0c6a1cd8 fixes stored password check with legacy encoding. 2013-12-31 13:27:47 +11:00
Sebastiaan Janssen
934d4020b2 Merge pull request #224 from Attackmonkey/Hackathon-2760 
Fixes issue U4-2760, sorting installed packages
 2013-12-29 06:30:09 -08:00
Sebastiaan Janssen
8b03ba4f42 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-12-29 15:26:44 +01:00
Sebastiaan Janssen
3caf84c63c Merge branch 'Hackathon-U4-3063' of https://github.com/Attackmonkey/Umbraco-CMS into Attackmonkey-Hackathon-U4-3063 2013-12-29 15:24:47 +01:00
Sebastiaan Janssen
aae16f227e Merge pull request #227 from mattbrailsford/6.2.0-3454 
Maintains tab sort order for doc type imports/exports.
 2013-12-29 06:20:09 -08:00
Sebastiaan Janssen
443002cdde Merge pull request #273 from esunxray/patch-2 
Update zh.xml
 2013-12-29 06:19:30 -08:00
Sebastiaan Janssen
75150f0bfa Merge pull request #223 from Attackmonkey/Hackathon-2757 
Fixes issue U4-2757 where generic properties are not ordered correctly.
 2013-12-29 06:18:19 -08:00
Sebastiaan Janssen
af73fd8b68 Merge pull request #218 from dipunm/U4-2551 
Missing languages in RTE insert link dialog.
 2013-12-29 06:11:53 -08:00
Sebastiaan Janssen
139df63ddf Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-12-29 15:08:10 +01:00
Sebastiaan Janssen
a49058fe00 Fixes U4-510 Copy node makes multiple copies 2013-12-29 15:07:28 +01:00
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
esunxray
1c901e00cc Update zh.xml 
add line <key alias="resetPassword">重设密码</key>
 2013-12-19 14:53:50 +08: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