yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,151 Commits 4 Branches 7 Tags
893855f8bd0aa72a7eeb33d032e4fc1a604fdf73
Commit Graph

806 Commits

Author SHA1 Message Date
Shannon
43603d0f97 fixes up the usage of the Repository.cs class since it is not disposing of the web service correctly. 2014-09-23 11:43:04 +10:00
Shannon
96d570e760 Gets most of the configurable list view working, need to add some validation to the pre-value editor, some styling for the sorting of a field, add another system field for 'published date' (if possible), fix up the localized text for return to list view, fix up the persisting of the last page viewed in a list view 2014-09-15 13:53:33 +10:00
Shannon
9bb5869cde reverting all things to do with additional list view column in db which is no longer necessary and removing additions to ui changes in the content tyep editor which are also no longer necessary 2014-09-12 11:50:56 +10:00
Shannon
7422238087 Merge branch 'AndyButland-u4-4972' into 7.2.0 
Conflicts:
	src/Umbraco.Web/Editors/MediaTypeController.cs
 2014-09-10 15:35:57 +10:00
Shannon
6afead5207 Merge branch 'u4-4972' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-4972 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
 2014-09-10 15:35:05 +10:00
Shannon
d2c7420c4c Merge remote-tracking branch 'origin/6.2.2' into 7.2.0 
Conflicts:
	src/Umbraco.Core/Models/DeepCloneHelper.cs
 2014-08-25 16:42:19 +10:00
Shannon
e2d04e2b3a Merge branch '7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/modals.less
	src/Umbraco.Web/Mvc/AdminTokenAuthorizeAttribute.cs
 2014-08-24 21:35:08 -06:00
Shannon
89b5774106 Fixes: U4-5380 Booting.aspx security issue 2014-08-21 14:39:06 -06:00
Sebastiaan Janssen
3a4d0a02eb Fix redirect issue 2014-08-21 14:16:58 +02:00
Sebastiaan Janssen
873eac7f24 Updating json.net dependency to 6.0.4 2014-08-20 10:44:05 +02:00
Shannon
9bb8ee5f95 ensure even when using the legacy api that the icon for media folder is correct 2014-08-15 11:57:01 -06:00
Sebastiaan Janssen
5fd59a6450 Fix merge problems 2014-08-04 13:56:51 +02:00
Sebastiaan Janssen
dba180d809 Merge remote-tracking branch 'origin/7.1.5' into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/lib/lazyload/lazyload.min.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
 2014-08-04 13:32:44 +02:00
AndyButland
332220acc4 Amend of container page size from structure tab of document type editing screen 2014-07-27 10:28:52 +02:00
Stephan
8729156fbf U4-4931 - lock contention & potential application lockdown 
Conflicts:
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
	src/umbraco.cms/Actions/Action.cs
 2014-07-10 10:34:17 +02:00
Stephan
43669e62b4 Merge branch '6.2.2' into 6.2-4931 2014-07-10 10:25:12 +02:00
Shannon
68b17bff08 Ensures no membership user writing when checking public access 2014-07-01 10:52:29 +10:00
Shannon
9b2b961f83 Ensures no membership user writing when checking public access 2014-07-01 10:51:56 +10:00
Shannon
59116fc7fa un-does the tag export/import, instead need to look at the internal of a simple publish (without save) to see if tags get written or not. 2014-06-30 17:05:34 +10:00
Shannon
a66670263f fixes null check 2014-06-30 17:04:59 +10:00
Shannon
1e1d49f305 fixes U4-5140 Package installation for content does not respect tags, however need to check with Morten if it's required because if we never actually publish content on package install then this wouldn't really matter. But surely we must publish on package install for some thing because starter kits are published... hrm. 2014-06-30 16:43:51 +10:00
Shannon
1be2706c30 fix merge 2014-06-30 15:09:41 +10:00
Shannon
eaf2956524 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/umbraco.cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs
 2014-06-30 14:26:33 +10:00
Stephan
3c8517edcb Merge branch '6.2.2' into 6.2-4931 2014-06-28 16:26:44 +02:00
Stephan
45e6127d00 U4-4866 - fix the build 2014-06-28 16:26:27 +02:00
Stephan
6eb5d3f7ef Merge branch '6.2.2' into 6.2-4931 2014-06-28 16:06:30 +02:00
Shannon
b404cc6438 Fixes: U4-5141 Packager doesn't respect 'allow at root' or 'list view' 2014-06-26 17:18:00 +10:00
Shannon
80103e6155 Fixes: U4-4866 Select content root when creating a package 2014-06-26 16:55:44 +10:00
Shannon
4fbf65e684 Fixes: U4-4866 Select content root when creating a package 2014-06-26 16:45:59 +10:00
Shannon
0aeac407c5 removes extremely silly try catch all when using the packager - why was this here !? So that nobody would ever know why creating their package failed? 2014-06-26 16:33:56 +10:00
Shannon
27764a2c82 merge issue 2014-06-25 18:58:29 +10:00
Shannon
0b678f1d3b Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	src/umbraco.cms/businesslogic/Packager/Installer.cs
 2014-06-25 15:59:20 +10:00
Shannon
72991334c4 little bit of code cleanup 2014-06-25 15:55:52 +10:00
Shannon
bb655afd72 Fixes: U4-5080 Error deleting property type that references tags 2014-06-19 17:39:31 +10:00
Morten Christensen
81e56bed9e Implementing Document Type Compositions in the Document Type Editor. 
Adds changes to the CMSNode and doc type related class which improves the internal usage of the new model based on IUmbracoEntity.
 2014-06-11 07:08:38 +02:00
Niels Hartvig
32cfdbe968 Fixes: U4-4892 Inconsistent (lack of) instructions regarding file extensions in the UI 2014-06-08 19:18:37 +02:00
Shannon
df3bc873df Upgrades mini profiler and enables it in the back offfice. 2014-05-30 15:26:22 +10:00
Stephan
16a1720bf7 Merge remote-tracking branch 'origin/6.2.1' into 6.2.1 2014-05-28 17:11:56 +02:00
Shannon
d987dfb5a2 Fixes: U4-4141 7.0.2 "Save and send for approval" fails for a writer user on a newly created unsaved content page 2014-05-28 12:40:43 +10:00
Shannon
fce8c9d3ec Fixes: U4-4141 7.0.2 "Save and send for approval" fails for a writer user on a newly created unsaved content page 2014-05-28 12:38:11 +10:00
Sebastiaan Janssen
524d6fb76a U4-4914 Add icon for 'Import Document Type' action menu 2014-05-27 12:12:34 +02:00
Stephan
46f57a3115 U4-4931 - lock contention & potential application lockdown 2014-05-18 19:13:22 +02:00
Shannon
3df2d03fc8 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Models/IPublishedContentProperty.cs
	src/Umbraco.Core/Models/PublishedContent/IPublishedContentExtended.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentExtended.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
	src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedFragment.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
	src/Umbraco.Web/PublishedContentPropertyExtension.cs
	src/Umbraco.Web/Search/ExamineEvents.cs
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/umbraco.cms/businesslogic/template/Template.cs
 2014-05-05 12:49:06 +10:00
Sebastiaan Janssen
c139c5d93e U4-3925 Cancel Document_BeforePublish event gives YSOD 2014-05-01 09:55:14 +02:00
Stephan
0501b181ce Refactor template aliases to strict aliases 2014-04-30 15:46:26 +02:00
Stephan
3cd3230b55 Refactor template aliases to strict aliases 2014-04-30 15:38:47 +02:00
Shannon
e0c3eda675 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Security/MembershipProviderBase.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/Models/DataValueSetterTests.cs
	src/Umbraco.Web.UI/web.Template.config
	src/umbraco.cms/businesslogic/media/Media.cs
	src/umbraco.cms/businesslogic/member/Member.cs
 2014-04-29 13:06:10 +10:00
Shannon
aba1862811 Fixes: U4-4754 Member and Media repositories need to generate preview xml when EnableGlobalPreviewStorage is true 2014-04-29 09:58:38 +10:00
Shannon
d9ac529e7e Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	src/Umbraco.Core/Models/PropertyType.cs
	src/Umbraco.Web.UI/umbraco_client/GenericProperty/genericProperty.js
	src/Umbraco.Web/WebServices/CoreStringsController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
 2014-04-24 16:33:04 +10:00
Shannon
61055380c5 Ensures that member saving events don't get raised for normal member operations like validating and getting a user and flagging them as online. This fixes: U4-3451 Cache on Partial View refreshed, after member execute login 2014-04-24 16:26:21 +10:00