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

3217 Commits

Author SHA1 Message Date
Shannon
32470e9bd2 fixes more tests 2015-01-09 11:23:40 +11:00
Shannon
defc9d3bc2 Updated all repo's to have their correct ctor's with their correct dependencies. Updated them all to accept ILogger updated all other dependencies with the same without breaking anything since all is internal, or obsoleted other public methods. Updates lots of the tests with mock instances instead, now more tests have less singleton dependencies, easier to test, much clearer and more IoC driven. Updated unit tests to supply the ILogger for required objects, tests should run faster now since most things are just mocked. 2015-01-09 10:51:15 +11:00
Shannon
519b06fe30 Moves logging interface to Logging namespace called ILogger, creates a resolver for it, updates the boot process to ensure it exists first and anything during the boot process that is logging ensures that if it is not resolved that it logs elsewhere. Wraps LogHelper to use the ILogger based on the resolver. Updates all services that used LogHelper to have an ILogger injected into them. This is really only the start, there's a ton of places that use LogHelper (508) other places so we'll need to start looking at changing those over. All base classes will need to expose an Ilogger so people can use that. 2015-01-07 17:23:24 +11:00
Shannon
7e1b20e600 Merge branch 'umbUKFest-U4-5231' of https://github.com/AnthonyCogworks/Umbraco-CMS into 7.3.0 
Conflicts:
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/MockTests.cs
 2015-01-07 16:13:47 +11:00
Shannon
023c7f3fe7 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-01-07 15:54:08 +11: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
f6cd597841 Fixes up some things from PR 610 and fixes up quoted values when using the Insert.IntoTable migration. 2015-01-06 13:44:42 +11:00
Shannon
fa48af02a1 Merge branch 'leekelleher-U4-337' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-01-06 12:24:29 +11:00
Shannon
8509aef99a Merge branch 'U4-337' of https://github.com/leekelleher/Umbraco-CMS into leekelleher-U4-337 2015-01-06 12:23:31 +11:00
Shannon
46e939715a Merge branch 'dev-v7' into 7.3.0 2015-01-06 12:22:54 +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
leekelleher
8a32f02781 Added custom event handler to create the relation for trashed nodes. 
Removed the additional (AJAX) resource call from the Angular controller, as the relation removal is handled in server-side code during the move.
 2015-01-04 20:46:00 +00:00
leekelleher
573192c33f Amends based @sitereactor's feedback. 2015-01-04 17:09:05 +00:00
leekelleher
eace046342 Moved the SQL insert (to create the new relation type) to a separate DB migration for v7.3.0. 
(This may need to be reviewed by Core team?)
 2015-01-03 22:20:19 +00:00
leekelleher
b449973403 Added the relationship between the trashed node and its former parent node 2015-01-03 20:10:42 +00:00
leekelleher
911e81e4af Added constants for the relation-type aliases. 2015-01-03 20:10:41 +00:00
leekelleher
ef0ad41c8e New relation type: "Relate Parent Document On Delete" 2015-01-03 19:52:04 +00:00
Shannon
fff1da2a12 Merge branch 'dev-v7' into 7.3.0 2015-01-02 16:25:52 +11: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
f91f25e5c0 Fixes issue with template model and package installation 2015-01-02 11:04:12 +11:00
Shannon
3f35ca1e77 Fixes merge and file encoding for master pages and templates to have BOM 2014-12-29 14:35:54 +11:00
Shannon
8c619e92d9 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2014-12-29 14:30:01 +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