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

5797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
Per Ploug Krogslund
0e431ffd3c File rename, refactor $httpBackend mocks 2013-07-02 09:17:32 +02:00
Shannon
9e419f9bcc Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 2013-07-02 12:58:40 +10:00
Shannon
357e29ebe1 implemented section resource and mocks to load in the sections (applications) 2013-07-02 12:57:28 +10:00
Per Ploug
32d7b88b45 Removes the ng-hide when unauthed 
Not needed anymore, still something weird with the retry queue tho
 2013-07-01 16:17:20 +02:00
Per Ploug
2b13dff769 Fixes login and tree 
Adds tree loader, fixes icons, fixes toggle arrows
Refactors httpbackend into nicer system
Testing of promises are broken :(
TODO: update docs
 2013-07-01 16:06:41 +02:00
Per Ploug Krogslund
0d44189f7f Mocked login works again 2013-07-01 09:58:10 +02:00
Shannon
a06821ffc0 missing files 2013-07-01 14:24:28 +10:00
Shannon
388f55d7fd Moved application logic into Core which are now 'Sections'. Have proxied all calls from the legacy application to sections. Streamlined how automapper configs are registered (much better now). Updated some unit tests to use the new classes instead of the legacy ones. Created the sections controller to return the sections from the back office. Changed the TypeFinder to search all types not just public ones, changed the boot managers to not have to explicitly modify the resolvers with internal types because now internal types are automatically found. 2013-07-01 14:23:56 +10:00
Per Ploug
ad766a2544 Authentication almost done 
Missing some styling and we are good to go on promised based
authentication
 2013-06-28 15:49:28 +02:00
Sebastiaan Janssen
ffce1a3e6b Open new branch for 6.1.3 2013-06-28 14:44:56 +02:00
Sebastiaan Janssen
e553f2c671 Correct little mistake in nuspec file 2013-06-28 14:21:25 +02:00
Per Ploug Krogslund
86a330ae8e enabled the security interceptor 2013-06-28 14:13:20 +02:00
Per Ploug
453719e07b Mocked server variables 2013-06-28 14:07:38 +02:00
Per Ploug Krogslund
0744adf8a2 Start on a proper httpbackend 2013-06-28 14:00:52 +02:00
Morten Christensen
42c6533e16 Correcting merge issues 2013-06-28 13:33:41 +02:00
Morten Christensen
b0f4cb7d02 Merge branch '6.0.7' into 6.1.2 2013-06-28 13:30:04 +02:00
Morten Christensen
f809dec874 Updating repository factory to inject unique name setting into ContentRepository 2013-06-28 13:28:03 +02:00
Morten Christensen
2477500045 Fixes #U4-2414 and removes internal usage of action handlers Yay! 2013-06-28 13:27:23 +02:00
Shannon
a077836936 Implemented the required/regex validation that is applied to PropertyType's on a Document type (this might be temporary if we get around to implementing pre-value overrides). Changed the name from ManifestValueValidator to just ValueValidator and allows for property editors to override the defaults if they need to change how the regex/required validation is processed against the property's value. Have streamlined all of the validation directives to require an FormController which we then listen to. Have removed valBubble as we don't actually need that functionality anymore and this simplfies input elements too. 2013-06-28 12:23:15 +10:00
Morten Christensen
d89539a437 Merge branch '6.1.2' of https://github.com/umbraco/Umbraco-CMS into 6.1.2 2013-06-27 15:36:46 +02:00
Morten Christensen
4368f15097 Updating nuspec files which is a bit different for 6.1.x then 6.0.x 2013-06-27 15:36:25 +02:00
Morten Christensen
b90150279b Merge branch '6.0.7' into 6.1.2 
Conflicts:
	build/Build.proj
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Tests/Services/ContentTypeServiceTests.cs
 2013-06-27 15:27:31 +02:00
Morten Christensen
ca1b05e30d Correcting unit test after update to ContentType ctor 2013-06-27 15:23:15 +02:00
Morten Christensen
5c09ba9a2d Updating nuspec files and build 2013-06-27 15:15:27 +02:00
Sebastiaan Janssen
cfa3e3aff1 Bump version number 2013-06-27 15:09:44 +02:00
Morten Christensen
59ff4a0484 It hurts having to do this, but Sebastiaan says I have to. So re-wiring the BulkPublishController to use the legacy Document class so legacy events are also fired. 2013-06-27 12:30:16 +02:00
Morten Christensen
b1db99f639 Fixing issue in previous fix for #U4-2182 2013-06-27 10:57:49 +02:00
Morten Christensen
ccbb838cef Fixing another part of #U4-2186 2013-06-27 10:56:45 +02:00