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

408 Commits

Author SHA1 Message Date
Shannon
6afd9b37a6 Merge branch '7.1.9' into 7.2.0 2014-11-26 15:29:18 +11:00
Shannon
bece953fa3 fixes a null check 2014-11-26 10:20:19 +11:00
Shannon
e2cc342adf Removes non-completed/tested/used code for templates which was during a WIP of the grid some time ago. 2014-11-25 17:36:44 +11:00
Shannon
ee040eb04f Merge branch 'umbukfest-U4-4731' of https://github.com/tompipe/Umbraco-CMS into tompipe-umbukfest-U4-4731 
Conflicts:
	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2014-11-21 09:25:57 +11:00
Tom Pipe
8a214b5181 Correctly translate property label and description on ALL Tabs 
Fixes U4-4731
 2014-11-20 15:19:58 +00:00
Stephan
e597886d0f Merge remote-tracking branch 'origin/7.2.0' into 7.2.0 2014-11-18 10:32:28 +01:00
Stephan
10e53de029 Safe compositions for 7.2 2014-11-18 10:29:46 +01:00
Shannon
1accc6275a Updates how the validation works in the member model mapper to use the native validation stuff instead of custom pre-values. 2014-11-18 14:32:51 +11:00
Robert Foster
ca951aa56b Fix for issue U4-5755 Issue: Multiple mixins with same tab cause content node edit crash 2014-11-08 01:13:17 +11:00
Shannon
cc8f07c0d8 Fixes: U4-5694 When searching in a picker, the filtering rules are ignored 2014-10-28 15:23:05 +10:00
per ploug
1de59f048b Fixed U4-5664 Change icon overlay on system list views 2014-10-27 14:29:01 +01:00
Shannon
fa2337f806 Fixes: U4-5649 Ensure NodeCount is on TagModel for TagQuery 2014-10-16 16:23:13 +10:00
Shannon
48d34af7bb Gets tree picker working better with searching and list views. 2014-10-13 17:27:22 +11:00
Shannon
e709a759ed Gets the icon for each content/media item indexed so it can be mapped and shown when showing search results. 2014-10-09 16:39:12 +11:00
Shannon
98eeaca5d5 Fixes: U4-5597 ServerVariables cannot include dynamic data like a users start node Ids 2014-10-07 14:59:07 +11:00
Shannon
58a0de086f fixes unit test 2014-10-03 17:07:27 +10:00
Shannon
b90f28731c Ensures the return to list button isn't shown on items in the recycle bin since that would navigate back to their original parent. Updates the recycle bin list views to respect the list view configuration of their associated sections. 2014-10-02 19:55:24 +10:00
Shannon
b975a02bfa Updates version to 7.1.7 2014-09-29 16:46:53 +02:00
Shannon
6f7ec84f18 Backports fixes to SQL parameterization and PetaPoco mem updates 2014-09-29 16:46:37 +02:00
Shannon
23b214e4f9 Fixes remaining tests 2014-09-25 13:52:16 +10:00
per ploug
872aff0c96 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-09-22 21:06:15 +02:00
per ploug
375fda2007 Merge remote-tracking branch 'origin/7.2.0-WIPFormsInstallDashboard' into 7.2.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-09-22 21:03:09 +02:00
Shannon
d87a426294 Implements the ability to have customized and configurable list views for specific content types 2014-09-22 18:18:09 +10:00
Shannon
7c76cbf509 Allows for email and username to be fields in list view, fixes up the list view usage to display members from a custom membership provider. 2014-09-19 15:34:26 +10:00
Shannon
b12985558a Fixes up all list views for all content types with regards to the delete button, now if you delete an child of a list view while viewing it it will redirect to it's container. 2014-09-19 13:55:30 +10:00
Shannon
0264a72762 Ensures default list view data types are installed by default, includes these in the upgrade script. Now the default list views are used when rendering them per type (content, media, member). Updated the member tree to list nodes by member type and 'all members', each of these now renders a list view containing the members which is fully paged and searchable. Updates list view prop editor to deal with members appropriately. 2014-09-19 09:47:42 +10:00
Shannon
89ebc80bd5 Gets the installer to install default list views, updates list view tree to show them as 'system' items which are not deletable, upgrader installs default list views, now property resolver gets the correct system list view for the correct content type with it's pre-values that are defined. 2014-09-18 11:52:12 +10:00
Shannon
fd07dcccb7 Reverts the 'special property' for list views as that is no longer required. 2014-09-18 09:48:08 +10:00
Shannon
c43be77288 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-09-15 19:01:49 +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
7ff0e6bafb Fixes typo: Updator -> Updater 2014-09-12 11:53:09 +10:00
Stephan
a3ad8e2cab Die, Marco, die. 2014-09-11 08:24:01 +02: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
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
per ploug
9aa9de5a7a WIP on background package installs 2014-08-18 20:42:56 +02:00
Shannon
4dc559a8d1 Removes class constraint on RenderModel<T> and UmbracoTemplatePage<T> which will make things more flexible. 2014-08-15 14:14:05 -06:00
Stephan
16f8db9dea U4-5084 - fix commit 2014-08-14 22:21:24 +02:00
Stephan
648cf69d45 U4-5084 - DynamicPublishedContentList ext methods confusion 2014-08-14 20:37:04 +02:00
AndyButland
964e18b84f Set up return to list button for list view children that on click returns to the list with the last viewed page restored 2014-07-30 23:14:24 +02:00
AndyButland
222f8b8744 Prevented and removed visual indication of sorting by custom columns 2014-07-28 23:08:20 +02:00
AndyButland
180e93a3bf Refactor of ContentTypeContainerConfiguration to use a collection instead of multiple delimited strings 2014-07-28 22:34:30 +02:00
AndyButland
50f1a995e9 Set up headings with localization for container list view custom columns 2014-07-28 22:07:57 +02:00
AndyButland
4d19826d98 Store and retrieval of flags for allowing bulk publish, unpublish and/or delete on container doc types 2014-07-27 15:36:18 +02:00
AndyButland
5ad8ebfa6e Store, retrieve and use default order by and direction for list container document type 2014-07-27 15:04:15 +02:00
AndyButland
599872a310 Created new field in cmsContentType and related models for storing the configuration for a container doc type; implemented configurable page size 2014-07-27 08:53:32 +02:00
per ploug
8a93c8371c Moves templatequery models into the right folder 2014-06-26 11:24:57 +02:00
Sebastiaan Janssen
344b880ba7 Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.controller.js
	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-06-10 15:22:31 +02:00
Jeavon Leopold
46d5215d9e Merge remote-tracking branch 'upstream/7.1.5' into 7.1.5-templatequery 2014-06-09 13:21:07 +01:00
Stephan
8a1db41fc4 Implement content.FirstChild 2014-06-09 13:04:40 +02:00