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

5509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
c8a19dff44 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web/Media/ImageUrl.cs
	src/Umbraco.Web/Media/ImageUrlProviders/ImageUrlProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs
 2013-06-19 18:26:45 +02:00
WadeKallhoff
a6768263d3 image thumb extension fix 2013-06-19 18:11:28 +02:00
kensykora
e66306978a macro rendering fix 2013-06-19 17:59:30 +02:00
Phil Dye
7f22809ebf U4-1478 Create button still visible when not active 2013-06-19 17:55:00 +02:00
Edwin de Koning
302ebde422 Translating the word "or" 2013-06-19 16:28:58 +02:00
Murray@tbpc10.terabyte.co.nz
cf5624f377 #U4-2326 Added Try Catch for PlatformNotSupportedException 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-19 16:24:09 +02:00
Morten Bock
f386c9d024 U4-1226 Umbraco:image control 2013-06-19 16:18:15 +02:00
Edwin de Koning
530fcf0ea3 Fixes U4-2261 2013-06-19 16:04:56 +02:00
Sebastiaan Janssen
26e4091f28 Due to previous fix we don't need to sort individually any more 
(see changeset 32f86f750e)
 2013-06-19 16:01:50 +02:00
Dennis Ravn Pedersen
32f86f750e Query would reverse logic sorting of children. Would make move operations ignore sorting. 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-19 15:36:08 +02:00
Sebastiaan Janssen
ebad631140 Merge branch '6.0.7' into 6.1.2 2013-06-19 15:16:32 +02:00
Sebastiaan Janssen
b8304c03ee Merge branch '6.0.7' of https://github.com/bokmadsen/Umbraco-CMS into bokmadsen-6.0.7 2013-06-19 14:50:41 +02:00
Sebastiaan Janssen
556c2d625f Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/umbraco.cms/businesslogic/member/Member.cs
 2013-06-19 14:42:14 +02:00
Sebastiaan Janssen
aaa4469def Merge branch '6.0.7' of github.com:umbraco/Umbraco-CMS into 6.0.7 2013-06-19 14:36:17 +02:00
Sebastiaan Janssen
baa0069262 Merge branch 'master' into 6.0.7 
Conflicts:
	README.md
 2013-06-19 14:22:57 +02:00
Sebastiaan Janssen
9ac4c7aef5 Merge branch 'master' of https://github.com/umbraco/Umbraco-CMS 2013-06-19 14:14:51 +02:00
Sebastiaan Janssen
cb2a35594f Merge branch '6.0.6' 
Conflicts:
	src/Umbraco.Core/TypeFinder.cs
 2013-06-19 14:13:09 +02:00
Sebastiaan Janssen
dd501d0198 Merge pull request #16 from darrenferguson/master 
Remove obsoletion of Member methods
 2013-06-19 05:07:35 -07:00
Sebastiaan Janssen
b724d8fb32 Merge pull request #15 from pynej/master 
Fix for U4-2384. Author not changed to current user when a node is copied.
 2013-06-19 05:06:23 -07:00
Darren Ferguson
7c6aee17e9 Remove obsolete messages from member class 
I've removed the obsolete methods from the member class because many of
the suggested alternatives don't work. and some require a lot of
configuration to get working.

Also, the member methods return Members - so they are not obsolete if
you want a reference to a member, you can choose to use System
membership if you want, but for custom properties and groups you need to
fallback to the Umbraco API, so these shouldn't be obsolete! :)
 2013-06-19 13:02:58 +01:00
Jeremy Pyne
5e2c3a0a8b Fixed a type on content copy. 2013-06-18 10:38:08 -04:00
Jeremy Pyne
f5121bd183 Fix for U4-2384. Author not changed to current user when a node is copied. 2013-06-18 09:35:33 -04:00
Bo Kingo Damgaard
51b5334126 Duplicate e-mail addresses: U4-315, U4-2147, U4-304 
- Allows for duplicate e-mail addresses in member section by opt-in
(requiresUniqueEmail="false" in
web.config/membership/providers/"UmbracoMembershipProvider").
- Fixes issues with backoffice not checking for duplicate emails when
changing member after creation.
- Lower cases email addresses upon creating member and when searching to
prevent duplicates.
- Added Member.GetMembersByEmail to get alle members with specific email
 2013-06-18 14:23:05 +02:00
Shannon
273c1956ab Fixes: #U4-2343 for api controllers, already fixed for surface controllers 2013-06-18 15:46:36 +10:00
Shannon
f7c474ac2c fixed merge issue and ensures UseNamespaceFallback are set for plugin controllers. 2013-06-18 15:24:44 +10:00
Shannon
4143dbd02d Fixed some merge issues 2013-06-18 15:20:18 +10:00
Shannon
768eb3d1ed Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
	src/Umbraco.Web/Mvc/PluginControllerArea.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
 2013-06-18 15:13:43 +10:00
Shannon
120bdca9eb removed constraint names on SurfaceControllers, they don't need to be suffixed with SurfaceController, only Controller. 2013-06-18 15:05:13 +10:00
Shannon
a5041aa34e Backported changes to use a real Area to do Umbraco area routes and updates our extension methods with the UseNamespaceFallback data token to only check in one namespace. 2013-06-18 14:59:00 +10:00
Shandem
59811c2841 Merge pull request #11 from florisrobbemont/6.1.2 
Fix U4-2286 - IFilteredControllerFactory classes are not resolved by Umb...
 2013-06-17 21:27:19 -07:00
Shannon
38eee6135e Merge branch '6.0.7' into 6.1.2 2013-06-18 14:21:11 +10:00
Shannon
d3780848dc updated ignore file with correct case sensitivity 2013-06-18 14:20:50 +10:00
Shannon
5719820fad Merge branch '6.0.7' into 6.1.2 
Conflicts:
	.gitignore
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
 2013-06-18 14:18:17 +10:00
Shannon
9d15228c68 manually applies patch for drag/drop fix in media for vdir 2013-06-17 03:06:24 +02:00
Shannon
c9c3623457 updated ignore 
Signed-off-by: Shannon <sdeminick@gmail.com>
 2013-06-17 02:59:00 +02:00
Floris Robbemont
aecc3d28bf Fix U4-2286 - IFilteredControllerFactory classes are not resolved by Umbraco 
Simple fix, just made the FilteredCOntrollerFactoriesResolver public. This way developers can add their own on application start
 2013-06-15 22:46:01 +02:00
Sebastiaan Janssen
b51022575f Merge pull request #8 from mattbrailsford/6.1.2 
Updated RenderMvcController to have the view engines test for file existance
 2013-06-13 03:42:34 -07:00
Sebastiaan Janssen
6600e9c899 Merge pull request #6 from dpen2000/UserPermisionsFixIn6.1.2 
Fix U4-2320 - Error on saving User Permissions (for 6.1.2 release)
 2013-06-13 03:18:37 -07:00
Sebastiaan Janssen
68aa2abbc0 Merge pull request #7 from pynej/6.1.2 
Fixed Ctl+S on stylesheets editor.
 2013-06-13 03:11:57 -07:00
Sebastiaan Janssen
e0a483ca48 Merge pull request #5 from tcmorris/patch-1 
Update README.md
 2013-06-13 02:05:43 -07:00
mattbrailsford
9b78cb3f7c Updated RenderMvcController to have the view engines test for file existance, rather than assuming views will always be razor. This allows alternative MVC view engines to be used. 2013-06-13 09:26:45 +01:00
Jeremy Pyne
c6c90fde44 Fixed Ctl+S on stylesheets editor. 2013-06-12 23:41:49 -03:00
david.pendray
773500332b Fix U4-2320 - Error on saving User Permissions 
Nodes can be null but NodeIds property always returns a collection and this will return Ids from Nodes if _nodeIds are null and Nodes is not.
 2013-06-13 02:50:25 +01:00
Thomas Morris
95eb00a81c Update README.md 
Updating link and formatting
 2013-06-12 18:24:54 +02:00
Sebastiaan Janssen
3921b0974e Merge pull request #3 from Jayshoe/patch-1 
Sitemap provider be gone! Issue #U4-1950
 2013-06-12 07:19:56 -07:00
Jayshoe
2cd07c841f Sitemap provider be gone! Issue #U4-1950 2013-06-12 16:19:14 +02:00
Sebastiaan Janssen
8f80f0e95c Merge pull request #2 from Jeavon/patch-1 
Update README.md
 2013-06-12 06:38:32 -07:00
Jeavon
73ac2c0309 Update README.md 
Readme.md corrections and updates
 2013-06-12 15:34:26 +02:00
Sebastiaan Janssen
a5ddb6c818 Merge pull request #1 from dpen2000/patch-1 
Update README.md
 2013-06-12 06:10:28 -07:00
dpen2000
458e61e049 Update README.md 
Fix link to Umbraco releases page
 2013-06-12 14:45:41 +02:00