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

10715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
4fe029a695 Fixes: U4-5291 UmbracoVirtualNodeRouteHandler throws exception: parameter culture cannot be null and publicizes some routing extensions. 2014-08-15 12:47:50 -06:00
Shannon
0fd37d708d Merge branch 'U4-5332' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-U4-5332 2014-08-15 12:04:54 -06:00
Shannon
f6abb0f603 fixes more of the photo arrangements in the photo folder which also fixes unit tests 2014-08-15 11:58:41 -06: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
Shannon
ac55724231 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-08-15 09:34:47 -06:00
Morten Christensen
5789ac28d2 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-08-15 14:45:54 +02:00
Morten Christensen
bc6ef58235 Making a few consistency updates to the TagService 2014-08-15 14:45:26 +02:00
Morten Christensen
9236225bdf Adding and updating code comments for the Membership service interfaces and implementations 2014-08-15 14:42:05 +02:00
Morten Christensen
6dbc30e094 Correcting a few comments on the UserService 2014-08-15 14:41:25 +02:00
Morten Christensen
1d4d8066ed Adds and updates code comments on the UserService 2014-08-15 11:13:00 +02:00
Morten Christensen
7a39751101 Adds code comments to the TagService and surrounding classes 2014-08-15 10:30:12 +02:00
Stephan
43ae301683 U4-4931 - fix tests 2014-08-15 09:50:55 +02: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
Stephan
a0fcd2c7f9 Merge pull request #423 from zpqrtbnk/7.1-4931 
U4-4931 - lock contention & potential application lockdown
 2014-08-14 20:28:18 +02:00
Stephan
d603c08e1f Merge branch '7.1.5' into 7.1-4931 2014-08-14 20:22:56 +02:00
Shannon Deminick
0aff4b4d05 Merge pull request #446 from nul800sebastiaan/U4-2238-hexadecimal 
U4-2238 6.0.5 - Issue when saving/publishing special characters - '' hexadecimal value 0x03, is an invalid character
 2014-08-13 09:57:30 -06:00
per ploug
5e738a2b7b Fixed: U4-4734 Remove default alt text on images from RTE 2014-08-13 11:01:56 +02:00
per ploug
652b9d1a86 Merge branch '7.1.5' of https://github.com/umbraco/Umbraco-CMS into 7.1.5 2014-08-13 10:42:54 +02:00
per ploug
dd72fd04bd Fixed: U4-5025 Backoffice spelling errors 2014-08-13 10:42:46 +02:00
Sebastiaan Janssen
83668db6e3 Update failing unit test now that MaxInvalidPasswordAttempts is 20 by default 2014-08-13 09:44:25 +02:00
Sebastiaan Janssen
ba7a5a0e8a #U4-2238 Fixed 
Moved some methods around, made them internal, removed cleaning of tags as that's already done by cleaning each property
 2014-08-13 09:38:40 +02:00
Sebastiaan Janssen
9523e5c854 U4-2238 6.0.5 - Issue when saving/publishing special characters - '' hexadecimal value 0x03, is an invalid character 2014-08-12 14:18:49 +02:00
Sebastiaan Janssen
db22dfcf7d #U4-5337 fixed Due in version: 7.1.5,6.2.2 
Too easy to lock yourself out of the backoffice
 2014-08-12 11:05:25 +02:00
Sebastiaan Janssen
9fc51d8a12 #U4-5258 Fixed 
RelationService AreRelated should accepts two entity IDs and a relationTypeAlias
 2014-08-12 10:23:11 +02:00
Shannon
247b5b648d Merge branch '7.1.5_U4-5316' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.1.5_U4-5316 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/multicolorpicker.controller.js
 2014-08-08 12:29:17 -06:00
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
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