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

1987 Commits

Author SHA1 Message Date
Stephan
912716f889 Content - add @isDraft to preview Xml for draft content 2013-09-16 17:17:42 +02:00
Stephan
5dc9bb752e Macros - cache xslt settings 2013-09-16 17:17:41 +02:00
Stephan
cf435011df Macros - support navigable caches 2013-09-16 17:17:39 +02:00
Stephan
f63514e8ea Web.PublishedCache - add XPathNavigatorIsNavigable to caches 2013-09-16 17:17:38 +02:00
Stephan
67a632aa43 Merge branch '6.2.0' into zb-cleanup 2013-09-12 11:13:07 +02:00
Shannon
dcd5decd3a Fixes up the events in the new MacroRendering event stuff 2013-09-12 14:55:29 +10:00
Shandem
b6d4415f5c Merge pull request #131 from neehouse/6.2.0 
Removing file location restriction from PartialViewMacro
 2013-09-11 21:47:51 -07:00
Shannon
24471c32f9 Improved search with "and", partial match U4-2509 
- added partial matching on each word.
- fixed bug so 'all' words match rather than 'any' words.
 2013-09-12 14:12:33 +10:00
Shandem
a353f6fb74 Merge pull request #135 from Myster/master 
Fix multiple words in search U4-2509
 2013-09-11 19:33:47 -07:00
Murray Roke
a64efb93b3 Improved search with "and", partial match U4-2509 
- added partial matching on each word.
- fixed bug so 'all' words match rather than 'any' words.
 2013-09-12 14:30:42 +12:00
Murray Roke
cf9f11ff45 Improved admin search splitting query U4-2509 2013-09-12 13:22:14 +12:00
Murray Roke
d7481b5ca4 Fix multiple words in search U4-2509 
When multiple words are entered in the search field no results are
returned.
This pull req. contains the fix suggested by Tony.
 2013-09-12 10:22:59 +12:00
Stephan
42c432caa0 Merge branch '6.2.0' into zb-cleanup 2013-09-11 10:39:40 +02:00
Stephan
32e3048717 Core.Attempt - refactor Succ() into Succeed() 2013-09-11 09:30:00 +02:00
Shannon
90abe8c25f Fixes: U4-2823 RenderRouteHandler.GetUmbracoRouteDefinition() fails to store the route definition when an incidental alias-controller match is made 2013-09-11 12:15:29 +10:00
Stephan
85ab96f71a Core.Attempt - refactor and cleanup 2013-09-10 17:56:47 +02:00
Stephan
1ba8ad5fbb Comments - UmbracoModule 2013-09-10 17:56:46 +02:00
Stephan
433e141761 Comments - misc 2013-09-10 17:56:44 +02:00
Stephan
9fa5821f07 Comments - Web.Standalone 2013-09-10 17:56:43 +02:00
Stephan
447b3227a9 Web.Routing - remove duplicate code 2013-09-10 17:56:41 +02:00
neehouse
1781528390 Removing Whitespace 2013-09-10 09:36:09 -04:00
neehouse
c0214ac4ec Modified the MacroRendering event as requested. Removed the unnecessary check for the file path from the Partial View Macro as it would not be hit anyhow since the macro engine is determined using the same rule. U4-2644 & U4-2643 2013-09-10 09:34:19 -04:00
neehouse
998e222881 Adding event to RenderMacro methods to allow for manipulation of the MacroModel. 2013-09-09 14:00:08 -04:00
Stephan
c5197dbe17 U4-2807 - better exception message on bogus domain 2013-09-07 10:25:39 +02:00
neehouse
d821401ea2 Removing file location restriction from PartialViewMacro to allow custom paths. 2013-09-06 15:34:19 -04:00
Shannon
c2b1ed205b Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-06 11:40:56 +10:00
Shannon
fee02af4eb Completes: U4-1639 Add support to generate GET urls to SurfaceController actions 2013-09-06 11:40:37 +10:00
dprothero
6675bac1dc Fix #U4-2796 - fixed copy/paste error (does not affect functionality) 2013-09-05 15:23:25 -07:00
dprothero
0d49a59cfe Fix #U4-2796 Possible to have duplicate Login Name (Member.LoginName) for Umbraco Members 2013-09-05 15:15:40 -07:00
leekelleher
4770e903fb Minor corrected to uQuery doco/comments. 2013-09-05 18:22:48 +01:00
Shannon
c269f55074 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-05 14:01:48 +10:00
Shannon
177486418d Implements: U4-1639 Add support to generate GET urls to SurfaceController actions 2013-09-05 14:01:28 +10:00
Morten Christensen
269f573b82 Refactoring the GetById method in the MemberService. 2013-09-04 16:00:38 +02:00
Morten Christensen
2ec367fd59 Removing the SecurityHelper and moving the 3 methods into the Provider as private classes, as they aren't used anywhere else. 
The SecUtility will be removed along with the legacy MembershipProvider when cleanup is possible.
 2013-09-04 15:44:29 +02:00
Morten Christensen
1f68cad45b Refactoring MemberService and MembersMembershipProvider from Darrens pull request to fit the changes made the past week. 
SecurityHelper is moved to the Umbraco.Web.Security namespace.
MembershipExtensions are changed to the new models
 2013-09-04 15:42:01 +02:00
Morten Christensen
8ffbad4b49 Merge pull request #118 from darrenferguson/6.2.0 
Adding new Memership provider implementation
 2013-09-04 06:14:40 -07:00
Morten Christensen
f2f1d265ec Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-03 17:15:03 +02:00
Sebastiaan Janssen
21954f7bc6 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-09-03 10:31:17 +02:00
Sebastiaan Janssen
25d2b56ed7 U4-2776 Default Content For A Razor Layout Section 2013-09-03 10:31:00 +02:00
Shannon
eeeb99b3b5 Fixes U4-2738 Collection Disposal issue when deploying 6.1.4 on Windows Server 2008 (Random, environment specific) 2013-09-03 17:19:31 +10:00
Morten Christensen
008d413302 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
	src/Umbraco.Tests/Services/ContentServiceTests.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
 2013-09-02 15:55:05 +02:00
Niels Hartvig
2fb55cb831 Enhanced permission checking on views and snippets 
Thanks to Richard Turnbull from NGS Secure Research who discovered a
minor issue that made it possible for authenticated Umbraco Users to
view files beyond their permissions
 2013-09-02 14:23:27 +02:00
Sebastiaan Janssen
437408464f Merge branch '6.1.5' into 6.2.0 
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
 2013-09-02 12:29:47 +02:00
Morten Christensen
969dece8fc Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-02 09:53:42 +02:00
Sebastiaan Janssen
7765acb130 Merge pull request #124 from AndyButland/wip-u4-2759 
U4-2759 - member authorise attribute was not restricting for group
 2013-09-01 17:23:53 +02:00
AndyButland
a262f0b342 Fixed bug where member authorise attribute was not restricting for groups 2013-08-31 22:52:54 +01:00
Morten Christensen
a1cae3f286 Fixes U4-2731 Document.BeforeMove + Document.AfterMove Doesn't get fired. 
Using the legacy Document and Media classes for the .Move and .Copy calls as they already use the new services under the hood, so shouldn't make any noticeable difference except that the legacy events will also work.

Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-08-31 19:18:47 +02:00
Morten Christensen
757283a3ff Making explicit references to the legacy member class to avoid ambiguous references to the new member classes 2013-08-31 19:09:29 +02:00
Shannon
d22dbb4654 Fixes U4-2734 Don't set the cache references to null when disposing the UmbracoContext 2013-08-31 11:11:25 +02:00
Stephan
4d5a8298b0 U4-2549 - fix it differently 2013-08-30 12:22:58 +02:00