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

10832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
fa4a268556 Updates some naming conventions and code formatting 2014-08-08 12:08:34 -06:00
Shannon
1449966537 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-08-08 12:00:35 -06:00
Shannon
24a6ae4e32 Fixes: U4-4634 Image preview in Media is stretched 2014-08-08 12:00:30 -06:00
per ploug
d2f9bd6896 Fixed: U4-5324 Users with a content root node, cant have custom tree roots 2014-08-08 10:54:05 +02:00
Shannon
6e3d0b5d91 fixes tests 2014-08-07 11:15:34 -06:00
Shannon
bf58359eed fixed tests 2014-08-07 11:10:40 -06:00
Shannon Deminick
59b4940979 Merge pull request #439 from AndyButland/u4-5290 
U4-5290 - allow for retrieval of a tag's count as well as it's text
 2014-08-06 18:58:00 -06:00
AndyButland
8f2f4b579e Added unit test for tags NodeCount property 2014-08-06 22:38:46 +02:00
AndyButland
5efabee0bd Added ignore attribute to NodeCount property on TagDto 2014-08-06 22:38:14 +02:00
Shannon
fc19748fbf Fixes: U4-5304 7.1.4 Media Picker can't view images RangeError: Maximum call stack size exceeded 2014-08-06 11:20:24 -06:00
AndyButland
6ea64c84d8 Removed parameter for requesting count for tags and made including the count the default behaviour 2014-08-06 07:36:25 +02:00
Shannon
7dfa633fb3 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Core/Sync/DefaultServerMessenger.cs
	src/Umbraco.Tests/Services/ContentServiceTests.cs
 2014-08-05 12:49:51 -06:00
Shannon
6ce303a918 Completes: U4-5264 Add Count methods to IContentService, IMediaService, etc... 2014-08-05 12:37:20 -06:00
Shannon
62d3dc78fa Ensures all caching is disabled for editing templates (master pages and views) 2014-08-05 10:59:54 -06:00
Shannon
3374f9e023 Ensures that the batched distributed calls doesn't cache refresh the server executing the distributed calls since tht will already be done locally. 2014-08-05 10:32:07 -06:00
Stephan
2675992d82 Merge branch '6.2.2' into 6.2-4931 2014-08-05 18:20:04 +02:00
Stephan
0a321e37fc Merge branch '7.1.5' into 7.1-4931 2014-08-05 18:15:51 +02:00
Stephan
f3ca9e067b Merge remote-tracking branch 'origin/7.1.5' into 7.1.5 2014-08-05 18:08:20 +02:00
Stephan
4814fb3e96 U4-5276 - get package installer to respect binding redirects 2014-08-05 18:07:50 +02:00
Stephan
ce29f54663 U4-4837 - bugfix Umbraco.Core.EnumerableExtensions.InGroupsOf 2014-08-05 17:52:43 +02:00
Shannon
7261162d8a Fixes some of U4-2633 Bundle all cache refresher transmissions into a single call per request for much better performance. See last note on issue. 2014-08-04 17:50:19 -06:00
Shannon Deminick
5f9b6c14f4 Merge pull request #441 from countrywide/U4-5110 
U4-5110 Prevent IE Compatibility Mode
 2014-08-04 10:59:27 -06:00
Shannon Deminick
7685e53cfe Merge pull request #440 from countrywide/7.1.5 
Fix for issue U4-4162 - MacroContainer editing
 2014-08-04 10:56:02 -06:00
Declan Cook
60e81a051d U4-5110 Prevent IE Compatibility Mode 2014-08-04 16:18:43 +01:00
Declan Cook
b2436bd9b6 Fix for issue U4-4162 - MacroContainer editing 
Allows editing of first element in a macro container.
 2014-08-04 16:07:07 +01:00
Sebastiaan Janssen
1c83114c78 Merge pull request #436 from lucasch/U4-5109 
U4-5109 - Added an icon for the Visual Blocks tinymce plugin to the skins CSS files
 2014-08-04 09:11:54 +02:00
Sebastiaan Janssen
46c07e55e4 Merge pull request #438 from AndyButland/u4-5221 
U4-5221 - Ensured multi-value data type prevalues are rendered sorted according to defined sort order
 2014-08-04 08:57:35 +02:00
AndyButland
6ee078108d Added NodeCount property to ITag/Tag and an optional flag to tag retrieval methods on TagsService, in order to retrieve the count for the tag as well as it's text 2014-08-03 23:09:56 +02:00
AndyButland
90eb5dc7ac Ensured multi-value data type prevalues are rendered sorted according to defined sort order 2014-08-03 20:00:04 +02:00
user
d6833c9b86 Updated the Umbraco TinyMCE skin to use the templates icon for visual blocks, 
Visual blocks had no icon in the css
 2014-08-01 11:58:33 -05:00
Shannon Deminick
2325c8a64f Merge pull request #434 from naepalm/7.1.5 
Updated the dictionary table icons and the CSS
 2014-07-31 18:46:29 -06:00
AndyButland
d8bddd80bb Fixed issue with hard-coded colspan for list view table footer and updated to reflect the number of columns 2014-07-31 17:54:10 +02:00
Sebastiaan Janssen
d4e205a47a Merge branch 'AndyButland-wip-u4-3963' into 7.1.5 2014-07-31 12:43:03 +02:00
Sebastiaan Janssen
84df6e5315 Merge branch 'wip-u4-3963' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-3963 2014-07-31 12:42:45 +02:00
AndyButland
a9c130d498 Amended tracking of last list view page viewed to store content Id as well as page, so it only restores the page for the appropriate list view 2014-07-31 09:43:19 +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
45c344a0ca Localisation of container config fields; applied sortable to list of additional columns 2014-07-30 22:05:43 +02:00
Janae Cram
af3b655073 Updated the dictionary table icons and the CSS to make the section more usable. 2014-07-30 09:12:06 -07:00
AndyButland
9a0451e1ad Improvements to UI for selecting additional columns for container list view 2014-07-30 09:43:37 +02:00
Shannon
f8e366bb4a fixes minor bool check in js for jslint 2014-07-29 11:23:58 -06:00
Shannon Deminick
6439d7337d Merge pull request #433 from arknu/rte_imagesizing 
U4-4729: Make max image dimension in RTE configurable
 2014-07-29 10:59:43 -06:00
Stephan
56dddbca1c U4-5275 - use IPublishedContentModelFactory for members 2014-07-29 10:56:49 +02:00
Stephan
53ea491bd6 U4-5286 - add property converter for color picker 2014-07-29 09:52:00 +02:00
Shannon
b5f900e789 added a couple of tests for member names 2014-07-28 19:37:44 -07:00
AndyButland
222f8b8744 Prevented and removed visual indication of sorting by custom columns 2014-07-28 23:08:20 +02:00
AndyButland
eba2ed842b Formatting of dates in list view 2014-07-28 22:46:18 +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
e1cf330638 Display or otherwise the bulk action buttons (publish, unpublish and delete) according to the container config 2014-07-27 20:52:06 +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