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

7444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
31535e3bd8 Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web.UI/umbraco/create/xslt.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
 2013-10-08 11:21:38 +02:00
Stephan
e7a238b2bc Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 2013-10-08 09:48:11 +02:00
Stephan
17c055472d Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent 2013-10-08 09:44:37 +02:00
perploug
dd4827493b missing files in sln 2013-10-08 09:31:30 +02:00
Shannon
572e23d307 Adds methods to IMemberTypeService 2013-10-08 17:58:38 +11:00
Shannon
febff1560e Added member type controller and resource, started getting creating members dialog working. 2013-10-08 17:49:40 +11:00
Shannon
7b14e8eacc Fixes member type repository when member types don't have properties declared and adds tests. Adds IMemberTypeService. 2013-10-08 17:47:29 +11:00
Shannon
881d922f30 Adds another overload for GetBigThumbnail, adds better thumbnail err checking to the folder browser thing and updates the file uploader to use this thumbnail proxy, now upgrades should be good. 2013-10-08 16:20:22 +11:00
Shannon
8b358da2f0 Creates big thumbnail proxy on the MediaController, now to wire it up with the folder browser and upload controls 2013-10-08 15:58:37 +11:00
Shannon
19d96ac0e2 ensures the lsit is created for styles. 2013-10-08 13:02:46 +11:00
Shannon
3a33a39411 Adds node styles and ensures they are set for the content tree nodes, now to get them to display styles 2013-10-08 12:58:11 +11:00
Shannon
883a662240 Moves tree/menu models into the Models.Trees namespace 2013-10-08 12:38:27 +11:00
Shannon
e6908c7678 Adds tag support to member repository. 2013-10-08 12:29:56 +11:00
Shannon
0b8b413f2f Adds tag support for any IContentBase and to the MediaRepository, adds test to ensure tags relations are removed. 2013-10-08 12:25:03 +11:00
Shannon
38a5b49ea3 renames methods on ITagsRepository to make it clear that the tags repo/db table ONLY deals with published tags. 2013-10-08 12:07:08 +11:00
Shannon
6a43972267 Adds content service tests for tags 2013-10-08 12:05:24 +11:00
Shannon
d102db795e Adds better compatibility for the legacy data layer and the ToXMl method - using our new xml converter. 2013-10-08 11:22:08 +11:00
Shannon
6f2a7180d8 Adds new ConvertDbToXml converter on the PropertyValueConverter and simplifies the ToXml method for PropertyExtensions. 2013-10-08 11:08:36 +11:00
Shannon
6cec665f7d Renames the PropertyValueEditor converter methods to be inline with the new converter method names 2013-10-08 10:58:47 +11:00
Shannon
d0cd8ba346 Moves GetPath to EntityController and entityResource since all entities can have a path not just content. 2013-10-08 10:55:47 +11:00
Shannon
16bce4248d Fixes merge issues with 6.2 and copying across TempData properly. 2013-10-08 10:46:02 +11:00
Shannon
a2e9ec0412 Merge remote-tracking branch 'origin/6.1.6' into 6.2.0 
Conflicts:
	src/Umbraco.Web/Mvc/UmbracoPageResult.cs
 2013-10-08 10:37:46 +11:00
Shandem
11c9abf359 Merge pull request #145 from florisrobbemont/6.1.6 
U4-3007 RouteDefinition should not store instance of controller
 2013-10-07 16:31:50 -07:00
perploug
4b942dcc32 Working link picker and TinyMCE plugin 2013-10-07 15:15:02 +02:00
Sebastiaan Janssen
12b7a9d874 Argh, didn't save csproj file before committing. 2013-10-07 13:20:34 +02:00
perploug
ec4eeb5de6 tree syncing 2013-10-07 10:09:03 +02:00
perploug
f676ce6ac2 Remove missing file to unbreak build 2013-10-07 10:08:48 +02:00
perploug
aa0bb166a8 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-10-07 10:08:28 +02:00
perploug
60a81ac879 Allows legacy editors to sync the tree 2013-10-07 09:48:08 +02:00
perploug
a9bc67538d Fixes: U4-3000 2013-10-07 09:39:25 +02:00
perploug
c0a7a9a427 adds section alias to framed urls 2013-10-07 09:33:29 +02:00
Sebastiaan Janssen
df909983db Update NuGet Core dependency to AutoMapper 3+ 2013-10-07 08:37:33 +02:00
Sebastiaan Janssen
1a9e5f20a8 U4-2511 Locallink:NODEID not working 2013-10-07 08:36:26 +02:00
Sebastiaan Janssen
a90f32035d U4-2733 call to umbraco.library:Request broken? 2013-10-07 08:18:44 +02:00
Sebastiaan Janssen
33b09c80aa Forgot to commit csproj file 2013-10-06 18:55:52 +02:00
Sebastiaan Janssen
b2980cedc6 Also apply to media types - U4-541 Wrong dictionary key when using in backend template names 2013-10-06 18:54:46 +02:00
Sebastiaan Janssen
34b7f86b8b U4-541 Wrong dictionary key when using in backend template names 2013-10-06 18:24:46 +02:00
Sebastiaan Janssen
130f6d3a42 Additions for U4-2776 Default Content For A Razor Layout Section 2013-10-06 17:52:46 +02:00
Sebastiaan Janssen
3ff9d6adbc U4-2509 Umbraco backend search not working correctly with spaces - Also updated search.aspx dialog 2013-10-06 16:55:54 +02:00
Sebastiaan Janssen
fd5de171c9 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-10-06 16:45:31 +02:00
Sebastiaan Janssen
45ad51b8df U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views 2013-10-06 16:45:21 +02:00
Floris Robbemont
b02657f32c Cleaning up commit for issue U4-3007 
Changed documentation on UmbracoMvcHandler
 2013-10-05 23:31:02 +02:00
Sebastiaan Janssen
9f3784aaed U4-1242 Template editor sometimes stops editing. 2013-10-05 19:26:01 +02:00
Sebastiaan Janssen
2ab2a5a9f3 Fix bug where Right ALT+S would save in Firefox instead of inserting the correct character 2013-10-05 19:23:57 +02:00
Sebastiaan Janssen
2d83ba06a5 Fix small styling issues in installer 2013-10-05 19:18:11 +02:00
Sebastiaan Janssen
06d5c60803 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-10-05 19:09:49 +02:00
Sebastiaan Janssen
fe18722e1f Merge pull request #147 from AndyButland/u4-2958 
Fix for issue U4-2958 Member can edit & Show on profile do not persist on Member Type editor
 2013-10-05 19:08:03 +02:00
Stephan
c2e7fc2f10 PropertyValueConverter - add converters for built-in data types 2013-10-04 20:14:38 +02:00
Stephan
e31dd688bf Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2013-10-04 14:54:18 +02:00
perploug
5060dab7a5 adds getpath to contentController 2013-10-04 14:01:07 +02:00