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

3231 Commits

Author SHA1 Message Date
unknown
a1bca2eba1 Fixed a syntax error in the spelling of the name of the method GetAllManifestFileContents(..). 2015-01-07 19:25:09 -08:00
Shannon
d6f47366d4 fixes how bytes are read with utf8 BOM for templates and master pages, fixes unit test 2015-01-07 15:11:27 +11:00
Shannon
699713346c Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-01-07 10:39:11 +11:00
Shannon
d4f28fcd85 fixes a couple of tests 2015-01-07 10:39:00 +11:00
Shannon Deminick
11e946d61c Merge pull request #614 from Alain-es/patch-2 
Fix bug U4-6071: Feature request - Add a specific section to all users
 2015-01-07 10:24:54 +11:00
Shannon
341239648d bumps version 2015-01-07 09:17:22 +11:00
Alain
cc61c34cdf Update UserService.cs 2015-01-06 12:15:32 +00:00
Alain
91b599b213 Update IUserService.cs 2015-01-06 12:14:13 +00:00
Shannon Deminick
462467a7d8 Merge pull request #616 from AndyButland/u4-6061 
U4-6061 - NodeCount for tags is not populated
 2015-01-06 15:44:47 +11:00
Shannon
ea12da99ea moves RelateOnCopyHandler to Core and changes from ApplicationStarting to ApplicationStarted 2015-01-06 12:22:11 +11:00
AndyButland
d235340ec6 Populated NodeCount property for tag queries retrieving tags across all types 2015-01-05 22:23:05 +01:00
Alain
d06ff5f108 Update IUserService.cs 2015-01-05 19:02:32 +00:00
Alain
d94fe7df68 Update UserService.cs 2015-01-05 18:55:31 +00:00
Shannon
d4c0ea9c48 working on U4-5875 - Updated RequiredManifestValueValidator to automatically check for empty json strings if the value type is JSON. Updates the TagsPropertyEditor to check for empty json in it's required validator. Updated the tags JS to always update the model value so if there's a server side validation, it gets cleared on change. 2015-01-05 14:25:16 +11:00
leekelleher
e8e6f5f807 Replaced the hardcoded integer values for -1 and -20 in ContentService with the Constants values. 
I did this whilst working on PR #610 (U4-337), but separated out to its own branch so not to clutter the other PR.
 2015-01-04 21:02:20 +00:00
Shannon
7c59c71261 updates PR for U4-6054 to just read directly from the file stream, no need to copy it first. 2015-01-02 15:58:31 +11:00
Shannon Deminick
a0c2914ce6 Merge pull request #604 from csharpforevermore/dev-v7 
Fixed: U4-6054 "Unit test 'Umbraco.Tests.IO.AbstractFileSystemTests.Can_...
 2015-01-02 15:54:11 +11:00
Shannon
28a01d61a6 Fixes: U4-5981 Umbraco 7.2 Text encoding when saving partial view template 2014-12-29 13:50:33 +11:00
Chris Randle
bc776d787e Fixed: U4-6054 "Unit test 'Umbraco.Tests.IO.AbstractFileSystemTests.Can_Get_Size()' fails" by looking at the size of the string not the file which can vary - possibly dependent on encoding. 2014-12-27 00:11:59 +00:00
Shannon
2f74dfe5cb fixes missing using statement 2014-12-24 17:01:41 +11:00
Shannon
84d2caf5d8 Merge branch '21robin12-7.2.0-U4-6004' into dev-v7 2014-12-24 12:34:10 +11:00
Shannon
456e7d9fdf Merge branch '7.2.0-U4-6004' of https://github.com/21robin12/Umbraco-CMS into 21robin12-7.2.0-U4-6004 2014-12-24 12:33:35 +11:00
Shannon
83aa30d2c5 Adds a VirtualPath property to IFile which is the relative path of the file to the root of the website. 2014-12-22 15:14:44 +11:00
Sebastiaan Janssen
72004768cf U4-5981 Umbraco 7.2 Text encoding when saving partial view template 
#U4-5981 In Progress Assignee Shandem
 2014-12-18 13:56:50 +01:00
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
cd0aa5e342 Fixed null checks and error checking for duplicates in the xml file store, added test 2014-12-18 12:33:34 +11:00
Robin Herd
c256266432 isResized now determined by regex 2014-12-17 13:06:46 +00: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
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
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
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
Morten Christensen
a446cc224d Refactoring the logic in the validation method for when ContentTypes are saved 2014-12-11 17:14:01 +01:00
Morten Christensen
07f9a9700d Ensures that inherited PropertyType aliases are also checked for indirect references 2014-12-11 12:22:49 +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
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
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
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