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

5954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Morten Christensen
173d388c12 Fixes #U4-2450 2013-07-04 12:31:31 +02:00
Morten Christensen
b1285fa7e3 Add missing id to unique naming overload 2013-07-04 12:31:10 +02:00
Morten Christensen
e34c857f6c A bit of refactoring around unique naming, and implementing it for media as well 2013-07-04 11:22:59 +02:00
Morten Christensen
7ff0e6cd4b Fixes #U4-2458 2013-07-04 10:50:02 +02:00
Per Ploug Krogslund
a984bf0d68 Fixes failing tests 
Adds a seperate unit test app loader, removes e2e backend from tests
adds scope.digest and httpbackend.flush to tests
 2013-07-04 09:28:27 +02:00
Shannon
371a0cc65a Fixes SectionService to properly return the user's allowed sections now that the IUserRepository is working nicely. 2013-07-04 15:33:24 +10:00
Shannon
7e345fda70 puts angular.js source back in repo as it is good for debugging/learning. Fixed editContentController tests, but now there's other test issues which I'm not sure how to fix ? 2013-07-04 15:16:02 +10:00
Shannon
15f0503a99 Added js unit tests for icon helper 2013-07-04 13:11:07 +10:00
Shannon
93844f30ac Re-fixed the section icons, deals with legacy icons, new icons and legacy file based icons 2013-07-04 12:50:25 +10:00
Shannon
0f06308efc removed VS build events, hopefully that can kick start the build server 2013-07-04 12:36:28 +10:00
Shannon
1f30a427b0 Reverted Tea commerce commit 2013-07-04 12:30:52 +10:00
Shannon
0683094f84 oops, overwrote previous changes to CmsNode, now merged them back in properly. 2013-07-04 12:20:25 +10:00
Shannon
983b7a85e1 Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-04 12:13:24 +10:00
Shannon
d015780b9f Fixes: #U4-2447 - non thread safe icon lookup 2013-07-04 12:13:02 +10:00
Per Ploug
01d55625d5 merge 2013-07-03 14:04:00 +02:00
Morten Christensen
aeece499bb Fixing unit test for PublishedMedia cache, which had expected result set incorrect 2013-07-03 14:00:44 +02:00
Per Ploug
693c0cb2a5 working modals 2013-07-03 13:55:33 +02:00
Morten Christensen
8465b4e556 Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 12:34:52 +02:00
Morten Christensen
e280785f48 Adding Msdeploy PropertyGroup to build prop file, so both FileSystem and MsDeploy package will include the umbraco and umbraco_client folders 2013-07-03 12:30:34 +02:00
Shannon
71bff2d1d7 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Core/Models/Membership/UserProfile.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
	src/Umbraco.Core/Services/UserService.cs
	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedUser.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-07-03 20:24:02 +10:00
Shannon
5e0a59e4b3 Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 19:47:25 +10:00
Morten Christensen
30835797ff Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 11:47:09 +02:00
Shannon
4077a01a6b Fixes: #U4-2344 - fixes examine re-indexing for media and a null check for DataType.Data 2013-07-03 19:47:06 +10:00
Morten Christensen
aed70ae40c Updating dependencies in our own nuspec file 2013-07-03 11:46:53 +02:00
Morten Christensen
6d44628352 Merge pull request #45 from jhauge/PublishUmbracoFiles 
Add Umbraco files during publish
 2013-07-03 02:39:12 -07:00
Jesper Hauge
7a398d34b1 Added file-reg to .nuspec 2013-07-03 11:33:05 +02:00
Morten Christensen
69c5aeb1b3 Updating nuget dependencies for test project 2013-07-03 11:29:58 +02:00
Shannon
da545b890b Updated UserRepository to not contain the general query methods, we do those in the service. 2013-07-03 19:26:28 +10:00
Morten Christensen
6609bc09f2 Updating nuget dependency for HtmlAgilityPack 2013-07-03 11:26:17 +02:00
Morten Christensen
f06a6f42da Updating nuget dependency for ClientDependency 2013-07-03 11:20:42 +02:00
Jesper Hauge
c9065d96a9 These files will add MSBuild target that copies /umbraco /umbraco_client and /App_Browsers files to .csproj files, during install of NuGet package UmbracoCms 
Functionality has been tested by creating af copy of the current Nuget package and add these files to the package, then using this package on a new Web application project. Building and doing a VS Publish to the filesystem.
 2013-07-03 11:17:47 +02:00
Morten Christensen
9d4e1362c4 Updating nuget references for ASP.NET MVC, Razor, WebPages and WebApi to latest patch release 2013-07-03 11:11:37 +02:00
Shannon
d3b69e04e1 Updated IUserService and added more unit tests for new methods. Fixed unit tests that were failing due to incorrectly set settings... not sure how this is working on the server but oh well. 2013-07-03 19:01:37 +10:00
Morten Christensen
0d54e8df89 Updating MySql package dependency 2013-07-03 11:00:26 +02:00
Morten Christensen
8f949d0a2f Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-03 09:40:17 +02:00
Shannon
d67480e98b Updated UserService, didn't need one of the methods on there, updated the unit tests to test all the other methods. 2013-07-03 17:09:14 +10:00
Shannon
5d76ead469 backported changes to IUserRepository from v7 2013-07-03 16:52:00 +10:00
Shannon
2796100067 added another unit test. 2013-07-03 16:45:56 +10:00
Shannon
a132f609d7 backports changes for -> Finished upgrading the UserRepository and entities to properly support Users' Allowed Sections & streamlines Persistence/Mappers with less code duplication. 2013-07-03 16:40:22 +10:00
Shannon
d85c454012 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
 2013-07-03 16:10:10 +10:00
Shannon
32ee1fadd6 Finished upgrading the UserRepository and entities to properly support Users' Allowed Sections 2013-07-03 16:07:20 +10:00
Shannon
a9efd08b08 Created new IUserProfile to support the Sections stuff as an interface to work in the IUserRepository 2013-07-03 11:16:45 +10:00
Shannon
3e31faee3b Moving UserSection implementation to one-many relationship with User object. 2013-07-03 10:29:05 +10:00
Per Ploug
a798b5c343 Try to get the dialogService to intercept legacy modals 
replace modals with dialogservice
 2013-07-02 16:17:59 +02:00
Per Ploug
2e636d5bcb fixes testing due to wrong httpbackend injection 2013-07-02 15:46:50 +02:00
Morten Christensen
7f7456701d Adding license 2013-07-02 15:32:53 +02:00
Per Ploug Krogslund
4c7351aa8a Working tree mock data 2013-07-02 10:45:43 +02:00
Shannon
ff410a9d7f Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/mocks/umbraco.httpbackend.js
 2013-07-02 17:47:57 +10:00
Shannon
3779e79367 Changes over SectionCollection to SectionService, ApplicationTreeCollection to ApplicationTreeService. Starts implementing UserSectionRepository for use with SectionService. Streamlines BaseMapper implementations. 2013-07-02 17:47:20 +10:00
Per Ploug Krogslund
7c63b88925 changed runner to phantomjs from chrome 2013-07-02 09:33:43 +02:00