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

5663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
befc0943b1 Merge branch '6.1.2' into 7.0.0 2013-06-20 11:26:18 +10:00
Shannon
cb592d687c Merge branch '6.0.7' into 6.1.2 2013-06-20 11:26:01 +10:00
Shannon
2161ec98b0 Fixes: #U4-2324 - Umbraco.Field will now work with custom routed pages. 2013-06-20 11:25:33 +10:00
Shannon
b4ba57695e Merge branch '6.1.2' into 7.0.0 2013-06-20 10:09:39 +10:00
Shannon
5a6ee168c3 Merge branch '6.0.7' into 6.1.2 2013-06-20 10:08:50 +10:00
Shannon
52292cab60 Fixes: #U4-2403 2013-06-20 10:08:02 +10:00
Shannon
24111c52f2 Obsoleted umbraco.businesslogic.ApplicationTree, have moved logic and new classes to core and proxied calls from it to the new ones. The new ApplicationTreeCollection will be the runtime colleciton of trees which can also read/write/save to the xml. 2013-06-20 10:05:51 +10:00
Stephan
2933c879e1 U4-2327 - fix PublishedContentRequest redirect vs. permanent 2013-06-19 20:30:43 +02:00
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
Shannon
2650740fa7 moved umbraco property editors into the core and outside the manifest (as c# declarations). Changed property editor names to not be editor.html and instead be the name of the folder as a convention. 2013-06-19 16:42:50 +10:00
Shannon
8db763c953 Updated server side stuff to work with new yepnope which makes things much simpler. 2013-06-19 13:45:41 +10: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
41346a784d adds ngdocs 2013-06-18 20:18:08 +10:00
Shannon
111ae3d3e3 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-06-18 20:09:30 +10:00
Shannon
608265ff19 Created new directive: umbpropertyinclude which handles the lazy loading of a property editor and then checks if it declares a controller before it compiles it. If it does, we'll make a lazy JS request for it's JS file and then finally compile it. With this in place we could have our own custom directive to officially state that a JS file is required instead of just checking for the ng-controller. 2013-06-18 20:08:00 +10:00
Per Ploug Krogslund
f92ee9b768 Updates the mocked content to support new editor path 2013-06-18 11:45:04 +02:00
perploug
26d63439ec Update README.md 2013-06-18 11:43:07 +02:00
perploug
bcc0beb79b Update README.md 2013-06-18 12:41:40 +03:00
Per Ploug
1ca883631e Media Resource Mock returns promise 2013-06-18 11:14:16 +02:00
Per Ploug
03b9a91458 merge 2013-06-18 11:09:16 +02:00
Shannon
3caa44d26b Removes property editor filter as it gets executed too many times, changed this into a helper method. 2013-06-18 19:02:53 +10:00
Per Ploug
e501e7fb98 chore Clean up the build/belle directory 2013-06-18 10:58:04 +02:00
Per Ploug
4b68d1950c Replaces require.js with jepnope 
Gets rid of the AMD pattern, adds scriptLoader service, work on security
service started
 2013-06-18 10:51:26 +02:00
Shannon
9720717076 changed default location of prop editor views to not be in the 'umbraco' folder (not needed) 2013-06-18 18:44:33 +10:00
Shannon
895ff65585 Got mock user data working and updated index.html to reflect how we're working with it in the .net solution with correct directives. Now mock tree data seems to be an issue. 2013-06-18 18:36:32 +10:00
Shannon
47b6c42253 removes mock userresource as that doesn't exist. 2013-06-18 18:17:25 +10:00
Shannon
4630ddb818 updated user service to use $q.when so we can just return values instead of promises. 2013-06-18 18:16:11 +10:00
Shannon
1f56d0b280 Starting to move umbraco property editors into the core, not in a manifest. 2013-06-18 17:57:15 +10:00
Shannon
816edce620 Implemented auto-mapper for mapping and converted over the user mappings. Got the gravatar directive working now too. Removed all umbracoUseMediumTrust settings. 2013-06-18 17:22:01 +10:00