yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,288 Commits 4 Branches 7 Tags
474dcd07548e6643d53d449955b878c6cf5fdff3
Commit Graph

6288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
474dcd0754 Fixes: U4-3587 Can't delete a member when there is a group assigned 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
 2013-11-20 18:24:44 +11:00
Shannon
369f6ac935 fixes merge issue 2013-11-20 18:15:11 +11:00
Shannon
5a928aa459 FIxes installer when duplicate conflicts: U4-3612 Cannot install Txt starter kit in the back office 
Conflicts:
	src/umbraco.cms/businesslogic/Packager/Installer.cs
 2013-11-20 17:28:33 +11:00
Shannon
416a9ed064 Comments out backported code - need to wait till we merge in the custom membership branch. 2013-11-20 17:10:15 +11:00
Shannon
b13c3aa3b9 Fixes: U4-3610 When adding another tab to a member type no members will load and result in a YSOD 
Conflicts:
	src/Umbraco.Core/Persistence/Relators/PropertyTypePropertyGroupRelator.cs
 2013-11-20 16:59:41 +11:00
Shannon
99ae94a82f Ensures that members are auto-approved if creating a member via the legacy members API. 2013-11-20 16:40:30 +11:00
Shandem
96440c9ee5 Merge pull request #248 from lars-erik/6.2.0-fix-sqlsyntaxprovider-indexclustring 
6.2.0 fix sqlsyntaxprovider indexclustring
 2013-11-14 22:00:31 -08:00
Shannon
b4c005c140 Fixes up the EntityRepository to use dynamics for media as well so that *all* fields in the main table are returned so we can store this information in AdditionalData, now that this is working nicely we should make the entity repo lookup the properties for content too just like we're doing for media since these get put into AdditionalData as well and there's really not much overhead to do that. 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
 2013-11-15 14:53:26 +11:00
Shannon
eca823ea90 Fix for U4-3529 Ysod editing Partial View 2013-11-15 13:49:20 +11:00
Lars-Erik Aabech
e3cd85a6a2 Made CreateIndexBuilder set IndexType in Clustered(), NonClustered() and Unique(). 2013-11-14 10:55:35 +01:00
Lars-Erik Aabech
69f805ecca Proof that CreateIndexBuilder.NonClustered() does not affect index creation statement on SQL Server. 
CreateIndexBuilder_SqlServer_NonClustered_CreatesNonClusteredIndex() fails expecting NONCLUSTERED but getting CLUSTERED.
CreateIndexBuilder_SqlServer_Unique_CreatesUniqueNonClusteredIndex() fails expecting UNIQUE NONCLUSTERED but getting CLUSTERED.
 2013-11-14 10:53:58 +01:00
Shandem
c037e2e09f Merge pull request #246 from lars-erik/6.2.0-fix-U4-3508 
Fixes Template.ToXml() (U4-3508) and refactored Template.Import to use P...
 2013-11-13 15:51:29 -08:00
lars-erik
d8debf6789 Fixes Template.ToXml() (U4-3508) and refactored Template.Import to use PackagingService.ImportTemplates. 
Fixed nullreference bug in ImportTemplates when used with XElement("Template"). (Added test for case with one template only)
 2013-11-13 14:27:05 +01:00
Shandem
e9ed1bf17a Merge pull request #244 from leekelleher/U4-3051 
Fixes: U4-3051 GetAncestorOrSelfDocuments gets stuck in infinite loop
 2013-11-12 14:11:05 -08:00
leekelleher
cfcfb75dcc Fixes: U4-3051 GetAncestorOrSelfDocuments gets stuck in infinite loop 2013-11-12 21:26:21 +00:00
Morten Christensen
181593f5ea Merge pull request #234 from saciervo/fix/petapoco-fetch 
SqlHelper Refactoring
 2013-11-11 02:59:49 -08:00
Shannon
a311a54d3d Hugely simplifies setting properties from macro parameters on user control macros with tests. 2013-11-11 12:22:29 +11:00
Sandro Ciervo
9911f03745 Fixed potential DbReaderException 
- Use Fetch<T> instead of Query<T> because we create another DbReader inside the loop with DoesMacroHaveParameters().
 2013-11-07 20:09:06 +01:00
Sebastiaan Janssen
d76336cd39 Merge pull request #194 from Attackmonkey/Hackathon-U4-3228 
Fixes issue U4-3228, where dictionary item names are not trimmed.
 2013-11-07 08:45:21 -08:00
Sebastiaan Janssen
0dc3920309 Merge pull request #191 from dipeshhirani/U4-2756 
Fixed the issue below: U4-2756
 2013-11-07 08:38:44 -08:00
Sebastiaan Janssen
98d1aafb75 Merge pull request #187 from wpyz/6.2.0 
Fixes issue with opening VS solution when only Visual Studio 2013 is installed (fixes U4-3445)
 2013-11-07 08:36:40 -08:00
Sebastiaan Janssen
6a0d7ec8d6 Merge pull request #183 from mkariti/U4-1477 
fix U4-1477
 2013-11-07 07:49:27 -08:00
Morten Christensen
f9a86385b5 Rearranging the create schema extensions methods to provide a bit more flexibility for external usage. 2013-11-07 14:03:34 +01:00
Morten Christensen
b8f7df1a96 Fixing the broken stylesheetrepository test and ignoring the StylesheetRepository in the RepositoryResolverTest for the time being as it takes two different UOWs as opposed to other repositories. 2013-11-07 13:33:49 +01:00
Tim Payne
425fd80e65 Fixes issue U4-3228, where dictionary item names are not trimmed. 2013-11-07 12:28:43 +00:00
Morten Christensen
04bb778dc1 Fix StylesheetRepositoryTest which broke as a result of PR #176 2013-11-07 12:52:25 +01:00
dipeshhirani
3f2be3342a Fixed the issue below: 
The "Unpublish" button (under Properties tab) is bad translated to Italian.
The used word is "Non pubblicato". This phrase is mean "It is not published".
A best translation is "Non pubblicare" (unpublish).

Did not do any of the others as they are either already done or the requesters change seems incorrect/irrelevent
 2013-11-07 11:42:08 +00:00
Morten Christensen
3ba50e7bae Merge pull request #176 from pynej/add-stylesheet-ids 
Fix for missing Id's on FileService.GetStylesheets() call.  This is need...
 2013-11-07 03:41:33 -08:00
Morten Christensen
7306ddef14 Merge pull request #182 from stocksr/6.2.0-petapoco-refactor 
6.2.0 petapoco refactor - umbraco.cms.businesslogic.language.Item
 2013-11-07 03:37:37 -08:00
Morten Christensen
17bb29eb66 Merge pull request #185 from saciervo/6.2.0 
Use PetaPoco instead of SqlHelper
 2013-11-07 03:35:49 -08:00
Morten Christensen
8bf3de738f Merge pull request #188 from stocksr/6.2.0-petapoco-refactor-umbraco.cms.businesslogic.language.Language 
Refactoring umbraco.cms.businesslogic.language.Language class
 2013-11-07 03:34:08 -08:00
Robert Stocks
2d37502a44 Refactoring umbraco.cms.businesslogic.language.Language class 2013-11-07 11:28:00 +00:00
Ryan Lewis
d5c485205a Whitespace 2013-11-07 11:24:40 +00:00
Ryan Lewis
9533198365 Can open VS solution with only Visual Studio 2013 installed (fixes U4-3445) 2013-11-07 11:23:41 +00:00
Morten Christensen
66f20e3800 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-11-07 12:19:27 +01:00
Sandro Ciervo
9269a98806 Refactored Umbraco.Web.UI.Controls.InsertMacroSplitButton 
- CreateChildControls()
- DoesMacroHaveParameters (Int32)
 2013-11-07 12:15:03 +01:00
mkariti
7c97fddec5 fix U4-1477 2013-11-07 13:08:56 +02:00
Morten Christensen
a567cf2a87 Minor update to the DefaultData so the used PetaPoco db object is consistent 2013-11-07 12:00:45 +01:00
Morten Christensen
1e319d667b Updating the remaining methods in the Notification class so it no longer uses the legacy SqlHelper. 2013-11-07 11:59:59 +01:00
Sebastiaan Janssen
cc039e365d Merge pull request #181 from Attackmonkey/Tim-Payne-Hackathon-U4-2708 
Fixes issue U4-2708
 2013-11-07 02:55:03 -08:00
Morten Christensen
f91ff5dc31 Special commit for a special Lars-Erik 2013-11-07 11:48:25 +01:00
Robert Stocks
9347a2edbb Refactoring umbraco.cms.businesslogic.language.Item class - Fix Update and Delete calls 2013-11-07 10:40:23 +00:00
Robert Stocks
64a73ef528 Refactoring umbraco.cms.businesslogic.language.Item class 2013-11-07 10:20:55 +00:00
Tim Payne
4ea04f5ffe Fixes issue U4-2708 2013-11-07 10:08:11 +00:00
Morten Christensen
6b006e6fd7 Refactoring GetUserNotifications method in the Notification class 2013-11-07 11:00:19 +01:00
Shannon
fc0654a80f Fixes: U4-2241 Native Multi-node tree picker in Member Types: Saving clears selected items 2013-11-07 12:02:41 +11:00
Sebastiaan Janssen
4717faaf1b Merge pull request #180 from Jeavon/U4-3432 
Fix for U4-3432Rollback Dialog - CreateDate/Creator formatting tweaks
 2013-11-06 09:48:08 -08:00
Jeavon Leopold
e7d587f776 Fix for U4-3432Rollback Dialog - CreateDate/Creator formatting tweaks required 2013-11-06 17:19:18 +00:00
Stephan
dca0c85db5 Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2013-11-04 12:54:07 +01:00
Shannon
5006115b2d Fixes object extensions and tests 
Conflicts:
	src/Umbraco.Core/ObjectExtensions.cs
	src/Umbraco.Tests/ObjectExtensionsTests.cs
 2013-11-02 15:20:04 +11:00