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

6315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
14790559cb Merge pull request #140 from pynej/search-node-type 
Add node type to search results
 2013-12-08 07:56:50 -08:00
Sebastiaan Janssen
97457087c7 Merge pull request #266 from greystate/patch-1 
Fix a typo/grammar error in da.xml
 2013-12-08 06:21:31 -08:00
Shannon
37eb66510f Fixes: U4-3505 Sometimes macro parameter types are not resolved during startup 2013-12-06 14:07:29 +11:00
Shannon
4cb4ff0617 Fix MySQL migrations. 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/AlterTagRelationsTable.cs
 2013-12-06 10:26:32 +11:00
Chriztian Steinmeier
dc60eb8383 Fix a typo/grammar error in da.xml 2013-12-05 13:06:24 +01:00
Shannon
f6179ff813 Strange, somehow these updates got overwritten 2013-12-05 16:11:15 +11:00
Shannon
1735c5adca adds Exists(string username) to member service and wraps IsMember with that call. 2013-12-05 16:04:53 +11:00
Shannon
31e715e146 Updates legacy Member class to setupNode based on the new IMember object (just like we do with media/content) - this will speed up data retrieval and is the start of wrapping the new API from the old one. 2013-12-05 15:51:38 +11:00
Shannon
5f50bae65c Cleaning up a bit of the legacy member class 
Conflicts:
	src/umbraco.cms/businesslogic/member/Member.cs
 2013-12-05 14:48:30 +11:00
Shannon
e6d8a83519 Ensures that the ContentBase item is set on Document/Media and that the property value is set based on the already loaded value in the model if IData implements IDataValueSetter (which DefaultData does). This streamlines how properties get their data and will save on a ton of queries when using the legacy API. 2013-12-05 14:26:18 +11:00
Shannon
38df2017de Fixes issue with deleting content types that have content 2013-12-04 15:01:27 +11:00
Shannon
33aa4e2062 Fixes potential xss 2013-12-04 13:33:24 +11:00
Shannon
1efa75c891 Fixes potential xss 2013-12-04 12:42:40 +11:00
Shannon
d4514844f8 Fixes a few other potential xss entry points 2013-12-03 17:58:42 +11:00
Shannon
6b7a495d19 Fixes a few other potential xss entry points and cleans up some legacy webforms files 2013-12-03 16:38:58 +11:00
Shannon
601eb0bf38 Fixes a few other potential xss entry points and cleans up some legacy webforms files 2013-12-03 16:28:51 +11:00
Shannon
037e7e0797 Fixes remaining xslt injection U4-3175 2013-12-03 15:56:50 +11:00
Shannon
a7e32e97e3 Fixes xss issue 2013-12-03 15:40:12 +11:00
Shannon
e981776e6d Created new EnsurePublishedContentRequestAttribute for custom routing to still be able to render macros. 2013-11-29 17:41:38 +11:00
Shannon
250276bbd4 Merge branch '6.1.6-U4-3619' into 6.2.0 2013-11-29 11:26:01 +11:00
Shannon
af29f61478 Fixes csrf issue 2013-11-29 11:10:25 +11:00
Shannon
58fc51ae93 Fixes: U4-3736 Unit test Can_Get_File_Dates() now testing correctly, disregarding local (nont-UTC) time. 2013-11-28 09:30:50 +11:00
Shannon
20813ef207 Fixes: U4-3673 Creating content with Services API always sets created by to admin 
Conflicts:
	src/Umbraco.Tests/Services/ContentServiceTests.cs
 2013-11-25 13:25:01 +11:00
Shannon
d04f2a98b9 Fixes tests 2013-11-21 17:47:57 +11:00
Shannon
f41f82adc5 Changes locker to be static 2013-11-21 14:46:18 +11:00
Shannon
e6ae88c016 Fixes hash generation and checking with the trees.config file - since this is changed during startup our plugin cache was never active :( 2013-11-21 14:45:52 +11:00
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