yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,877 Commits 4 Branches 7 Tags
938b236f549672635c24cdca08a97e3cfd6cdecb
Commit Graph

11877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
938b236f54 fixes initialized flag on section service 2014-12-18 15:12:22 +11:00
Shannon
5b9a98ad6a Simplifies the ILocalizedTextService to not have an extension method for null tokens, adds another extension method to accept an array of tokens, adds null checks. 2014-12-18 12:45:04 +11:00
Shannon
3323138232 Fixes up js localization service so that it doesn't make a ton of requests on first load, Fixes: U4-2675 Create new controller service to output the json for localization for use in angular service 2014-12-18 12:35:38 +11:00
Shannon
cd0aa5e342 Fixed null checks and error checking for duplicates in the xml file store, added test 2014-12-18 12:33:34 +11:00
Shannon
f63ec81c47 cleans up commented out code 2014-12-18 10:58:41 +11:00
Shannon
db087a9e78 pretty much got 5966 working just need to do some more tests. 2014-12-17 17:08:12 +11:00
Shannon
4e33552a5c wip - working on U4-5966 2014-12-17 16:19:42 +11:00
Shannon
da25970f79 wip - working on U4-5966 2014-12-17 15:19:03 +11:00
Shannon
0807597a3c Fixes: U4-5977 The debounce timeout on the main search is too big which produces a lag in searching & U4-5994 Global search needs to only show results for the 'last' search request made and ignore previous ones 2014-12-16 15:50:54 +11:00
Shannon
d564866b07 Merge branch 'Aaen-7.2.0' into dev-v7 2014-12-16 14:34:13 +11:00
Shannon
99a45d26ae Merge branch '7.2.0' of https://github.com/Aaen/Umbraco-CMS into Aaen-7.2.0 2014-12-16 14:33:21 +11:00
Shannon Deminick
5bf9362c92 Merge pull request #586 from Alain-es/Fix-for-U4-5852 
Fix for U4-5852
 2014-12-16 11:24:56 +11:00
Shannon Deminick
d9925e3453 Merge pull request #589 from teeto/patch-1 
Update es.xml
 2014-12-16 11:08:16 +11:00
Shannon
e1106a9d67 Merge branch '7.2.1-doctype-fixes' into 7.2.1 
Conflicts:
	src/Umbraco.Core/Models/PropertyGroupCollection.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Services/ContentTypeService.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
	src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
 2014-12-16 09:47:53 +11:00
Sebastiaan Janssen
a8d7a1d01d Makes the test green: don't add the passed in composition as a dependency to itself.. also added another invariant check 2014-12-15 19:52:28 +01:00
Sebastiaan Janssen
e62597521e Remove the renaming to 'title' which would cause a duplicate and make the next test fail 2014-12-15 19:51:37 +01:00
Sebastiaan Janssen
fa91321299 Adds test for adding properties to a composition that has been saved and now doesn't allow a new property to be added 2014-12-15 18:56:58 +01:00
Morten Christensen
2d81691407 Adding new test case for renaming PropertyType aliases on indirect references 2014-12-15 16:34:41 +01:00
Morten Christensen
21f08ca491 Refactoring validation and adding new test case for renaming PropertyTypes 2014-12-15 15:33:05 +01:00
Morten Christensen
e202f21934 Adds new test, fix, refactoring for adding duplicate PropertyType aliases 2014-12-15 14:29:48 +01:00
Shannon
2936ff0bf9 Makes provider user key type for new membership provider configurable, by default it is int 2014-12-15 20:44:00 +11:00
Alain
55dbc82d75 no-dirty-check all lower case 2014-12-15 09:11:21 +00:00
Sebastiaan Janssen
8e4e575276 Makes sure messages are shown in the user's configured language 2014-12-15 09:30:04 +01:00
Sebastiaan Janssen
84752babc8 Moved both new sections to the bottom so it's easier for upgraders to merge them 2014-12-15 09:04:25 +01:00
Shannon Deminick
e1ec49fd3c Merge pull request #592 from Bitmapped/7.2.1-U4-5564 
Better fix for U4-5564
 2014-12-15 13:24:24 +11:00
Shannon
60a1116acd Fixes: U4-6009 Distributed calls not working in 7.2 2014-12-15 11:45:55 +11:00
Sebastiaan Janssen
a480d7bbe6 U4-5959 Getting YSOD when wanting to create partial view in a subfolder in the backoffie 
#U4-5959 Fixed Due in version 7.2.1
 2014-12-14 17:22:10 +01:00
Sebastiaan Janssen
7316c5462a U4-5928 Umbraco 7.2 RC GetCurrentMemberProfileModel Null Ref 
#U4-5928 Fixed Due in version 7.2.1
 2014-12-14 16:50:11 +01:00
Morten Christensen
2a9960afb3 Adding UI feedback for invalid compositions 2014-12-12 17:04:53 +01:00
Morten Christensen
ed899ec73d Adding additional test coverage for Compositions and updating PropertyTypes and PropertyGroups 2014-12-12 17:04:11 +01:00
Morten Christensen
8f26f9385d Refactoring the logic around saving updates to PropertyTypes and PropertyGroups 2014-12-12 17:02:03 +01:00
teeto
45241788b3 Update es.xml 
I have updated the es.xml file adding the values for grid section and the values marked as version="7.2" which were not translated
 2014-12-11 18:16:35 +01:00
Morten Christensen
a446cc224d Refactoring the logic in the validation method for when ContentTypes are saved 2014-12-11 17:14:01 +01:00
Alain-es
8bfcd4ce3f using noDirtyCheck directive instead of removing valFormManager directive 2014-12-11 11:41:17 +00:00
Morten Christensen
07f9a9700d Ensures that inherited PropertyType aliases are also checked for indirect references 2014-12-11 12:22:49 +01:00
Sebastiaan Janssen
7e7acd0049 Correcting my mistakes to the unit test, using the wrong alias 2014-12-11 11:02:51 +01:00
Morten Christensen
57985c26a2 Updating the name of PropertyGroups in DB to ensure renaming is done properly 2014-12-11 10:55:33 +01:00
Morten Christensen
504c1f7254 Updating tests related to #U4-5986 
Conflicts:
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
 2014-12-11 10:55:21 +01:00
Shannon
52ad36a6c2 removes commented out code form PR 2014-12-11 10:49:41 +01:00
Peter Gregory
01670e0832 Fixes issue U4-5925 GetMedia returning nothing 
Removed the use of FromXElement that was only used by GetMedia.  The change introduced in commit f3f6504398 caused GetMedia to return nothing due to the introduction of the FromXElement method.
 2014-12-11 10:49:30 +01:00
Shannon
e1a93e9b3f updates the cdf mvc version to match the one in the nuspec 2014-12-11 19:57:59 +11:00
Shannon
2203db548a updates port 2014-12-11 19:01:32 +11:00
Shannon
ff66c90855 doh, fixed nuspec, there's no mvc cdf 1.8.1. updates the port 2014-12-11 18:49:40 +11:00
Shannon
b0779cb330 updates examine local storage logic for when there are no indexes and they need to be created 2014-12-11 18:43:39 +11:00
Shannon
e3f043794b removes commented out code form PR 2014-12-11 18:42:51 +11:00
Shannon
25c021d0a9 Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1 2014-12-11 17:56:04 +11:00
Shannon
8f35c8fb57 Fixes: U4-5996 CDF reference issue 2014-12-11 17:55:53 +11:00
Shannon Deminick
45e3b2acf4 Merge pull request #587 from pgregorynz/7.2.1 
Fixes issue U4-5925 GetMedia returning nothing
 2014-12-11 17:47:00 +11:00
Shannon
082d116924 updates nuspec with examine and cdf updates 2014-12-11 17:46:06 +11:00
Peter Gregory
85ccea60ab Fixes issue U4-5925 GetMedia returning nothing 
Removed the use of FromXElement that was only used by GetMedia.  The change introduced in commit f3f6504398 caused GetMedia to return nothing due to the introduction of the FromXElement method.
 2014-12-11 16:27:06 +10:00