yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,845 Commits 4 Branches 7 Tags
326d81286aa4d3d31ea3ea91c1dfa69edb501ea8
Commit Graph

8845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shandem
326d81286a Merge pull request #281 from Jeavon/U4-3987 
Fixes U4-3987- Related Links
 2014-01-07 15:47:16 -08:00
Jeavon Leopold
13641473d0 Fixes U4-3987- Related Links 2014-01-07 14:40:45 +00:00
Shandem
b3151ca788 Merge pull request #280 from AndyButland/wip-u4-3980 
Fix to SQL on inserting tags to handle tag with apostrophe (U4-3980)
 2014-01-06 15:59:09 -08:00
AndyButland
aa1edb6e69 Fix to SQL on inserting tags to handle tag with apostrophe 2014-01-06 21:56:10 +01:00
Shannon
3fcdbe85b5 Fixes merge and build issues 2014-01-02 15:41:00 +11:00
Shannon
78336181ea Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Models/Membership/MembershipExtensions.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Security/MembershipProviderBase.cs
	src/Umbraco.Core/Services/IMemberService.cs
	src/Umbraco.Tests/App.config
	src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedMember.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/tinyMceConfig.Release.config
	src/Umbraco.Web.UI/config/tinyMceConfig.config
	src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
	src/Umbraco.Web/Security/Providers/MembersMembershipProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentControl.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/member.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/userTasks.cs
	src/umbraco.controls/TabView.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
 2014-01-02 15:28:42 +11:00
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
90174a39e3 Merge branch 'enkelmedia-patch-2' into 7.0.2 2013-12-29 12:41:12 +01:00
Sebastiaan Janssen
4d9f9c890d Merge branch 'patch-2' of https://github.com/enkelmedia/Umbraco-CMS into enkelmedia-patch-2 2013-12-29 12:40:46 +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
07f3de8b67 updates port number 2013-12-28 14:42:34 +11:00
Shannon
0955b0c474 fixes proj ref 2013-12-28 14:37:53 +11:00
Shannon
57d1ff20fd Improves test suite performance - this should shed a few minutes off of the test runs. 2013-12-28 14:35: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
b924b06062 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-28 13:57:53 +11:00
Shannon
fb029861cf Fixes: U4-3942 Cannot configure the request if there is not content assigned - exception 2013-12-28 13:57:20 +11:00
perploug
4eb19bd26c Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-27 22:03:30 +01:00
perploug
71a07060a9 removes debugging output from treesource preval editor 2013-12-27 21:55:59 +01: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
d474481cba publicizes MemberService so that devs can use the events on nightly builds for now. 2013-12-24 11:03:20 +11:00
Shannon
62e3ab27fe Adds comments to EntityController code to use UmbracoHelper 2013-12-24 10:58:11 +11:00
Shannon
86c008fc8c Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-24 10:49:01 +11:00
Shannon
154ee39755 Fixes: U4-3907 Token cookie issues in 7.0.1 2013-12-24 10:48:32 +11:00
Shannon
63ca9f210b updates version # 2013-12-24 10:48:14 +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
perploug
28c2aa1195 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-19 11:32:17 +01:00
perploug
391c778b80 Minor refactor of treesource internal model 2013-12-19 11:32:09 +01:00