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

5955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeavon Leopold
05039fdd7c U4-2783 url attribute in installedPackages.config is not populated when a package is installed 2013-09-03 13:32:10 +01:00
Sebastiaan Janssen
21954f7bc6 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-09-03 10:31:17 +02:00
Sebastiaan Janssen
25d2b56ed7 U4-2776 Default Content For A Razor Layout Section 2013-09-03 10:31:00 +02:00
Shannon
eeeb99b3b5 Fixes U4-2738 Collection Disposal issue when deploying 6.1.4 on Windows Server 2008 (Random, environment specific) 2013-09-03 17:19:31 +10:00
Sebastiaan Janssen
35c7b224bd Fix merge issue 2013-09-02 12:49:01 +02:00
Sebastiaan Janssen
437408464f Merge branch '6.1.5' into 6.2.0 
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
 2013-09-02 12:29:47 +02:00
Sebastiaan Janssen
173ac65eb5 Remove misleading comment as this has been moved out of the if statement 2013-09-02 11:41:13 +02:00
Sebastiaan Janssen
7c28e1aeba Fixed U4-2763 Content rollback generates duplicates 2013-09-02 10:56:42 +02:00
Shannon
5989d19f7f Re-fixes the issue with using IDataValueSetter.SetValue on the DefaultData implementation and ensures that when there is a null value that it reverts to an empty string since this was what the default value was in the Value getter of DefaultData when there was no value. Have added a couple unit tests to support. 2013-09-02 13:27:48 +10:00
Shannon
da1c33a034 Fixes unit test 2013-09-02 12:57:56 +10:00
Sebastiaan Janssen
2111a5e31e Fix MySQL install failing on UmbracoServer table 2013-09-01 17:28:22 +02:00
Sebastiaan Janssen
5478de911b Merge pull request #115 from stocksr/6.2.0 
U4-516 - Fix DatePicker with time default value
 2013-09-01 17:24:03 +02:00
Sebastiaan Janssen
7765acb130 Merge pull request #124 from AndyButland/wip-u4-2759 
U4-2759 - member authorise attribute was not restricting for group
 2013-09-01 17:23:53 +02:00
Sebastiaan Janssen
a535a4c96f Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-01 17:21:32 +02:00
Sebastiaan Janssen
c3ef39661b Fix MySQL install failing on UmbracoServer table 2013-09-01 17:21:19 +02:00
Sebastiaan Janssen
e9b9fb15c1 Can't install starterkits message was always showing, even if install folder was present 2013-09-01 16:47:28 +02:00
Sebastiaan Janssen
3d4b54064f I love managing files in csproj files.. NOT. 2013-09-01 15:32:55 +02:00
Sebastiaan Janssen
14303fab0c File move didn't make it into the csproj file previously, leading to build errors. Fixed! 
Also changed default PartialView template and added another Empty one
 2013-09-01 15:05:17 +02:00
Sebastiaan Janssen
262ef8d305 Merge pull request #115 from stocksr/6.2.0 
U4-516 - Fix DatePicker with time default value
 2013-09-01 05:34:18 -07:00
Sebastiaan Janssen
6e6ac8a4d5 Merge pull request #124 from AndyButland/wip-u4-2759 
U4-2759 - member authorise attribute was not restricting for group
 2013-09-01 05:22:51 -07:00
AndyButland
a262f0b342 Fixed bug where member authorise attribute was not restricting for groups 2013-08-31 22:52:54 +01:00
Morten Christensen
5640daff32 Fixes U4-2752 ContentService.DeleteVersion and DeleteVersions fail 
Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-08-31 19:19:25 +02:00
Morten Christensen
a1cae3f286 Fixes U4-2731 Document.BeforeMove + Document.AfterMove Doesn't get fired. 
Using the legacy Document and Media classes for the .Move and .Copy calls as they already use the new services under the hood, so shouldn't make any noticeable difference except that the legacy events will also work.

Signed-off-by: Sebastiaan Janssen <sebastiaan@umbraco.com>
 2013-08-31 19:18:47 +02:00
Shannon
d22dbb4654 Fixes U4-2734 Don't set the cache references to null when disposing the UmbracoContext 2013-08-31 11:11:25 +02:00
Stephan
4d5a8298b0 U4-2549 - fix it differently 2013-08-30 12:22:58 +02:00
Stephan
9e2733ce69 U4-2549 - fix issue with last chance content finder 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj

Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-08-30 12:22:36 +02:00
Sebastiaan Janssen
fbfdd8d398 Bump version number 2013-08-30 12:00:33 +02:00
Stephan
2552dffdad U4-2691 - fix issue with alt template and internal redirects 2013-08-30 11:59:28 +02:00
Sebastiaan Janssen
52540165f1 Creating a partial view now inherits from UmbracoTemplatePage (in 6.2.0 there will be 2 snippets, one for UmbracoViewPage<dynamic>, for MVC experts and one for UmbracoTemplatePage, the default). 2013-08-30 11:47:39 +02:00
Shannon
2b408df24c Fixes: U4-2727 PluginManager's TypeList can contain duplicates - updates the locks to be upgradeable read locks, changes over all lists/collecitons to be HashSet<T> this ensures no duplicates and also improves performance. 2013-08-30 10:51:06 +02:00
Shannon
d559411187 Fixes U4-2300 6.1.0: Changing a template's parent causes tree to collapse 2013-08-30 10:45:13 +02:00
Sebastiaan Janssen
3a4a6579d3 Fixes: U4-2711 DAMP throws unknown exception on image upload with image cropper 2013-08-30 10:40:29 +02:00
Shannon
9b56c7eab6 Fixes U4-2300 6.1.0: Changing a template's parent causes tree to collapse 2013-08-30 14:15:51 +10:00
Shannon
f332e6530a Ensures the whole ancestry of view data is merged in with unit tests. 2013-08-30 12:50:39 +10:00
Shannon
c228c24ba5 Creted MergeParentContextViewData filter, this is by default applied to SurfaceController's and the PartialViewMacroController. Now if you are rendering a partial view macro or a child action from a SurfaceController and are putting data into ViewData on a POST, you don't have to access the ViewData from the ParentViewContext. 2013-08-30 12:03:16 +10:00
Shannon
697aa03758 Fixes U4-1339 SurfaceController returning PartialView - cannot use ModelState - TempData merge correctly. 2013-08-30 11:34:02 +10:00
Stephan
c62689450b Merge remote-tracking branch 'origin/6.2.0' into 6.2.0 2013-08-29 17:28:46 +02:00
Stephan
0ed4c1868b U4-2549 - fix it differently 2013-08-29 17:08:16 +02:00
Sebastiaan Janssen
2bdbd6c7d9 Updated controller, more flexible, moved UmbracoProperty to Umbraco.Web.Helpers 2013-08-29 16:12:50 +02:00
Sebastiaan Janssen
23517d0c36 Argh, starter kit is hardcoding a content type, so I have to register the new member type with a different Id 2013-08-29 16:10:23 +02:00
Sebastiaan Janssen
2238f81d83 Oops, accidentally killed creating a partial view from the backoffice as it's also using PartialViewTasks.cs (like when you create a partial view macro) 2013-08-29 16:09:23 +02:00
Sebastiaan Janssen
4ef10c8afe Install a default member type during initial setup 2013-08-29 13:54:30 +02:00
Shannon
244dcff8da Fixes: U4-1339 SurfaceController returning PartialView - cannot use ModelState ? 2013-08-29 14:51:30 +10:00
Shannon
2e747caa10 Fixes: U4-2727 PluginManager's TypeList can contain duplicates - updates the locks to be upgradeable read locks, changes over all lists/collecitons to be HashSet<T> this ensures no duplicates and also improves performance. 2013-08-29 13:33:01 +10:00
Shannon
93691f13df Fixes U4-2734 Don't set the cache references to null when disposing the UmbracoContext 2013-08-29 12:38:14 +10:00
Shannon
258d526435 Merge branch 'U4-2711-Fix-imagecropper-ToXMl' of https://github.com/stocksr/Umbraco-CMS into stocksr-U4-2711-Fix-imagecropper-ToXMl 
Conflicts:
	src/umbraco.editorControls/imagecropper/DataTypeData.cs
 2013-08-29 12:31:08 +10:00
Shannon
357dc6ec8e Fixes: U4-2711 DAMP throws unknown exception on image upload with image cropper 2013-08-29 12:27:49 +10:00
Shannon
232c81543a Fixes the rest of U4-2713 Property Editor Value Converters don't get applied to Umbraco.TypedMedia 2013-08-29 12:11:48 +10:00
Shannon
581f3a1893 Fixes build errors 2013-08-29 12:01:30 +10:00
Shannon
9fc3efd73a Fixes U4-2713 Property Editor Value Converters don't get applied to Umbraco.TypedMedia 2013-08-29 11:59:07 +10:00