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

9512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
59cdb8a6fe Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-11 17:27:30 +11:00
Shannon
aed4c1faed minor code cleanup and a null check. 2014-03-11 17:26:14 +11:00
Shannon
2ecab70772 Fixes: U4-4182 Exception during plugins loading 2014-03-11 17:00:35 +11:00
Shannon
894a649574 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-11 15:02:48 +11:00
Shannon
48bbf1ecb2 Fixes unit tests 2014-03-11 15:02:23 +11:00
Shannon
5dc44ca612 fixes some merge issues 2014-03-11 15:02:14 +11:00
Shannon
3c771648e3 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentType.cs
	src/Umbraco.Core/Persistence/Factories/MemberReadOnlyFactory.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
	src/Umbraco.Web/Security/MembershipHelper.cs
	src/Umbraco.Web/UmbracoHelper.cs
 2014-03-11 14:47:00 +11:00
Shannon
c500d29029 adds some exceptions 2014-03-11 14:44:18 +11:00
Shannon
2c8fe5a130 fixes a few issues 2014-03-11 14:35:49 +11:00
Shannon
d737afa327 Working on 2014-03-11 14:23:51 +11:00
Shannon
2db1c1bb40 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-11 10:39:55 +11:00
Shannon
d95ca7bc6f updates naming from CreateProfileModel to GetCurrentMemberProfile 2014-03-11 10:39:19 +11:00
Sebastiaan Janssen
6b491ac6cd Merge pull request #312 from vnbaaij/patch-1 
Update en_us.xml
 2014-03-10 10:13:58 +01:00
vnbaaij
278b681501 Update en_us.xml 
header was incorrect:
<language alias="en" intName="English (GB)" localName="English (GB)" lcid="" culture="en-GB">
 2014-03-10 10:07:30 +01:00
Shannon
abd72e7676 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 2014-03-10 18:09:20 +11:00
Shannon
ec6cb4520c Fixes: U4-3835 U7(nightly214) - Umbraco.Field not working 2014-03-10 17:44:40 +11:00
Shannon
2dfa85c9b4 Fixes merge issues 2014-03-10 17:35:28 +11:00
Shannon
921a5963e2 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web.UI/umbraco/create/simple.ascx
	src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
	src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
 2014-03-10 17:30:46 +11:00
Shannon
3626d5b79d fixes unit tests 2014-03-10 17:27:22 +11:00
Shannon
980e8e84a6 Fixes: U4-4353 You are able to create duplicate content/media/member type's with the same alias 2014-03-10 17:26:04 +11:00
Shannon
4070669e7d Completes: U4-4335 It's Possible to Create Duplicate Data Types 2014-03-10 16:00:53 +11:00
Shannon
b20e61d316 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	build/Build.bat
	src/Umbraco.Web.UI/umbraco/create/simple.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.designer.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs
	src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
 2014-03-10 15:27:09 +11:00
Shannon
fb764641c5 Fixes: U4-4335 It's Possible to Create Duplicate Data Types 2014-03-10 15:16:17 +11:00
Shannon
405727f1ac Completes: U4-3919 Get google spellchecker working in new RTE editor in a much better way that requires no server side implementations - it enables spell checking by the browser in the RTE which is heaps better and less code for us 2014-03-10 14:36:20 +11:00
Shannon
6446f63dcb Fixes: U4-4366 Lots of js errors in RteController when editing the rte data type 2014-03-10 14:16:24 +11:00
Shannon
f1963fb404 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-10 12:56:01 +11:00
Shannon
c26b72bd10 fixes a locking issue and exception logging 2014-03-10 12:55:45 +11:00
Shannon
b94cee68e7 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-03-10 11:23:06 +11:00
Shannon
b67fbbcbd8 Fixes: U4-4015 Usercontrol Browse Properties error 2014-03-10 11:22:49 +11:00
perploug
71fcc77e9b merge 2014-03-09 22:24:04 +01:00
perploug
38509f9d5a Adds details view to media picker to edit alt text 2014-03-09 22:21:55 +01:00
perploug
3ff04f585c Fixes issue with late-loaded file resolvers 2014-03-09 22:21:36 +01:00
Sebastiaan Janssen
3de8f9bd18 Merge pull request #311 from arknu/71-issue3691 
U4-3691: Use empty alt text instead of 'Some description'
 2014-03-08 14:05:52 +01:00
arknu
c95e7c245e U4-3691: Use empty alt text instead of 'Some description' 2014-03-07 22:24:28 +01:00
perploug
fce31a2e02 7.1 beta 2014-03-07 15:26:28 +01:00
Sebastiaan Janssen
4d3eef1124 Update version 2014-03-07 15:25:10 +01:00
perploug
b816e7f4db Fixes: sites cannot run the new installer if they have /install directory 2014-03-07 12:10:04 +01:00
perploug
45f6d4f911 ensures the installer clears angular cache 2014-03-07 12:10:00 +01:00
Shannon
6a9a1d1547 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-07 20:26:57 +11:00
perploug
391eb99e10 Installer facts typo 2014-03-07 10:18:36 +01:00
perploug
3b4487c836 Fixes: Weird merge issue with dashboard.config 2014-03-07 10:18:30 +01:00
perploug
46461c7c5d Fixes installer breaks with missing app_data/temp/installer folder 2014-03-07 10:18:08 +01:00
perploug
7104629ffd Fixes installer database dropdown default value 2014-03-07 10:17:46 +01:00
Shannon
b46abecde5 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByDate.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByName.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesOrderedByProperty.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/ListChildPagesWithDoctype.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/LoginStatus.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Navigation.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/SiteMap.cshtml
	src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/Navigation.cshtml
	src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/SiteMap.cshtml
 2014-03-07 20:10:33 +11:00
Shannon
e82795f798 Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 2014-03-07 20:09:32 +11:00
Shannon
a6faf5b757 fixes build issue 2014-03-07 20:09:22 +11:00
Shannon
3e6e6faf03 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2014-03-07 20:08:22 +11:00
Shannon
b3f18bc677 fixed an issue with setting password with legacy api 2014-03-07 20:08:10 +11:00
Sebastiaan Janssen
a48fe40675 Also clean up v6 snippets 2014-03-07 09:46:45 +01:00
Shannon
74c777b1ae Ensures the built-in member controllers have the correct logic - somehow got reverted and then not merged. 2014-03-07 19:39:31 +11:00