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

9626 Commits

Author SHA1 Message Date
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
Robin Herd
599d367343 Fixed bug U4-6004, MediaService.GetMediaByPath now returns IMedia for paths containing 'x' and '_' 2014-12-11 17:59:52 +00: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
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
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
Shannon
49e5493d52 Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1 2014-12-11 15:59:06 +11:00
Shannon
a700258d92 WIP - updates to latest examine which exposes some methods needed to get this syncing done. This will not build until i put that examine version on nuget (soon). Ensures all readers/writers uses the same deletion policy, ensure segments file is copied across on sync restore. Changes the config to use an enum instead of a boolean which will give us some more flexibility. 2014-12-11 15:58:54 +11:00
Morten Christensen
712fb9f11a Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1 
Conflicts:
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
 2014-12-10 22:22:29 +01:00
Morten Christensen
c16a1c727d Updating the name of PropertyGroups in DB to ensure renaming is done properly 2014-12-10 22:20:00 +01:00
Morten Christensen
78bc12eb77 Updating tests related to #U4-5986 2014-12-10 22:19:17 +01:00
Alain-es
9c10145869 Fix for U4-5852 2014-12-10 15:18:41 +00:00
Stephan
99c96bce86 U4-5986 - reject ppty alias used by ancestor 2014-12-10 13:01:51 +01:00
Stephan
70424183fa U4-5986 - reject ppty alias used by ancestor 2014-12-10 13:00:56 +01:00
Sebastiaan Janssen
da2bc6764b Version also updates in the csproj 2014-12-10 12:59:08 +01:00
Shannon
d11a377f0f bump version 2014-12-10 12:28:06 +01:00
Stephan
d445f7cb0d U4-5986 - reject ppty alias used by descendant 2014-12-10 12:27:55 +01:00
Stephan
d02235b997 U4-5986 - reject ppty alias used by descendant 2014-12-10 12:04:13 +01:00
Sebastiaan Janssen
899d325ca1 Updates unit tests to use the newer new ContentType method and obsoletes the old one 2014-12-10 11:52:03 +01:00
Sebastiaan Janssen
f1107b7a91 Fixes U4-5986 Compositions: Possible to get stuck in document type ysod's 
#U4-5986 Fixed Due in version 7.2.1
 2014-12-10 11:51:53 +01:00
Stephan
a3f171e7b3 U4-5931 - fix DocType inheritance issue 2014-12-10 11:51:42 +01:00
Sebastiaan Janssen
8b3e80a001 Updates unit tests to use the newer new ContentType method and obsoletes the old one 2014-12-10 11:42:45 +01:00
Brian Powell
13a2d845c6 Clean up comments. 2014-12-10 03:13:49 -05:00
Sebastiaan Janssen
c20c93e648 Fixes merge issue 2014-12-09 21:14:22 +01:00
Brian Powell
2c212cb16a Better fix for U4-5564 - replaces reverted part of Pull #492 2014-12-09 13:38:59 -05:00
Sebastiaan Janssen
848e8a6248 Fixes U4-5986 Compositions: Possible to get stuck in document type ysod's 
#U4-5986 Fixed Due in version 7.2.1
 2014-12-09 19:30:48 +01:00
Stephan
9dcba6a679 U4-5931 - fix DocType inheritance issue 2014-12-09 17:58:54 +01:00
Stephan
c8f80453b9 U4-5929 - support IDN in hostnames 2014-12-09 09:34:58 +01:00
Shannon
d857743bf3 moves the local storage logic to the BaseUmbracoIndexer 2014-12-09 19:15:47 +11:00
Shannon
f08320bd81 Fixes: U4-5976 When no Examine indexes exist they are rebuilt at startup, however the rebuilding happens too soon before any Examine event handlers are actually wired up. 
Updates examine version to facilitate this. Adds ability to tokenize the {machinename} in an examine index path.
 2014-12-09 19:07:14 +11:00
Shannon
a1fcdac896 Merge branch '7.2.1' of https://github.com/umbraco/Umbraco-CMS into 7.2.1 2014-12-09 19:05:11 +11:00
Shannon
ae2d9e6c55 Fixes: U4-5977 The debounce timeout on the main search is too big which produces a lag in searching 2014-12-09 19:05:00 +11:00
Shannon
451be273a5 bump version 2014-12-09 18:55:54 +11:00
Shannon Deminick
bf7473145f Merge pull request #577 from abjerner/patch-4 
Moved the right click action for the tree header
 2014-12-09 16:06:56 +11:00
Shannon Deminick
01a309ef42 Merge pull request #582 from arknu/propertyeditor-localization 
U4-5101: Localize property editors (updated)
 2014-12-09 13:08:19 +11:00
Dennis Aaen
3a919b67ea U4-5973 Fix casing of word XSLT when saving a XSLT file 2014-12-08 20:09:05 +01:00