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

5598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Morten Christensen
aed70ae40c Updating dependencies in our own nuspec file 2013-07-03 11:46:53 +02:00
Morten Christensen
69c5aeb1b3 Updating nuget dependencies for test project 2013-07-03 11:29:58 +02: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
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
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
Morten Christensen
7f7456701d Adding license 2013-07-02 15:32:53 +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
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
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
Sebastiaan Janssen
0d5ec8bfd5 Merge branch '6.0.7' into 6.1.2 2013-06-26 20:57:32 +02:00
Sebastiaan Janssen
5f67e85471 Merge branch '6.0.7' of github.com:umbraco/Umbraco-CMS into 6.0.7 2013-06-26 20:55:11 +02:00
Sebastiaan Janssen
d9228c368f Fixes U4-2404 Photo gallery broken on Azure - Since the template saving routine is doing ToSafeAlias, we should also do it when setting the default template 2013-06-26 20:54:36 +02:00
Morten Christensen
8226505e5b Merge branch '6.0.7' into 6.1.2 2013-06-26 15:55:49 +02:00
Morten Christensen
41b8de09b7 Fixes U4-2234 including test case from issue 2013-06-26 15:49:00 +02:00
Morten Christensen
bbf06cd13d Fixes U4-2234 2013-06-26 14:31:36 +02:00
Morten Christensen
639cb17741 Fixes U4-2182 and U4-2167 2013-06-26 14:31:10 +02:00
Morten Christensen
4643d34546 Moving generation of xml from ContentExtensions to the PackagingService 2013-06-26 13:30:54 +02:00
Sebastiaan Janssen
50035eae49 Merge pull request #33 from bokmadsen/6.0.7 
Bugfix for previous pullrequest "Duplicate e-mail addresses: U4-315, U4-...
 2013-06-26 02:43:34 -07:00
Bo Kingo Damgaard
2d857a8635 Bugfix for previous pullrequest "Duplicate e-mail addresses: U4-315, U4-2147, U4-304" 
There was a bug in the previous pullrequest that didn't allow a member
to saved if the email wasn't changed. Furthermore duplicate emails are
now prevented if requireUniqueEmail was false, but is switched to true
(when saving a member)
 2013-06-26 10:47:27 +02:00
Morten Christensen
e4387b8dae Adding some internal bits in the ServiceContextManager and PackagingService 2013-06-25 13:43:57 +02:00
Morten Christensen
188aca499a Merge branch '6.0.7' into 6.1.2 2013-06-25 11:54:24 +02:00
Morten Christensen
3040d362ef Fixes #U4-2361 2013-06-25 11:48:37 +02:00
Shannon
a57aa07721 Updated default controller resolver to use new IRenderMvcController interface, fixed some merge issues. 2013-06-25 09:55:45 +10:00
Shannon
f2b8e3407b Merge remote-tracking branch 'origin/6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web/Mvc/RenderControllerFactory.cs
	src/Umbraco.Web/Mvc/RenderMvcController.cs
	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-06-25 09:41:27 +10:00
Shannon
1ec7cd3b89 Implements: #U4-2342 - IRenderMvcController 2013-06-25 09:33:48 +10:00
Sebastiaan Janssen
bd77463fa4 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Core/Models/ContentTypeBase.cs
	src/Umbraco.Core/Models/IContentTypeBase.cs
	src/Umbraco.Core/Models/PropertyGroupCollection.cs
 2013-06-24 12:06:58 +02:00
Sebastiaan Janssen
368954226a Update to not require specific version of MVC4, just 4.0.20710.0 and higher 2013-06-24 12:05:22 +02:00
Sebastiaan Janssen
496d51c2a0 Merge pull request #25 from kipusoep/Duplicate-words-domainHelp 
Duplicate words removed
 2013-06-24 01:30:04 -07:00
Stefan Kip
b01b4f7aa7 Forgot to update XML comments 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-24 10:29:03 +02:00
Stefan Kip
49a699c858 Added RemovePropertyGroup method 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-06-24 10:28:42 +02:00
Morten Christensen
f68571ef7c Merge pull request #24 from kipusoep/U4-2421-RemovePropertyGroup 
U4-2421 Added RemovePropertyGroup method
 2013-06-24 01:18:21 -07:00
Stefan Kip
6cc1735363 Duplicate words removed 2013-06-23 21:49:43 +02:00