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

10731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
895ecf5f16 Merge branch 'u4-5003' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-5003 2014-08-18 11:38:09 -06:00
Shannon Deminick
9d95e9f4d3 Merge pull request #452 from kgiszewski/feature/rte-config-cache 
Add caching to the RTE config
 2014-08-18 10:34:07 -06:00
Kevin Giszewski
42dd38fb29 Add caching to the RTE config 2014-08-18 09:23:46 -04:00
Shannon Deminick
023a8da5ba Updated DetectIsEmptyJson with more robust sln 2014-08-15 14:23:21 -06: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
Shannon
1686e2f4bf Fixes: U4-5333 Datepicker starts on today's date instead of current value when you switch nodes 2014-08-15 13:48:07 -06:00
Shannon
69244f6991 Fixes: U4-4263 U7 - HasValue method returns true for Json editors when there is no value 2014-08-15 13:21:00 -06:00
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
AndyButland
53097a9b84 Moved added method from PetaPoco file to an extension method 2014-08-14 18:16:49 +02:00
AndyButland
beda0968ae Removed debug line 2014-08-14 18:07:21 +02:00
AndyButland
ca2dd3eb47 Fixed issue with list view filter; further unit tests for list view paging 2014-08-14 08:42:36 +02:00
AndyButland
8ea5b6fb46 Unit tests for content repository paged queries; amends to fix ordering issues 2014-08-14 00:16:37 +02:00
AndyButland
f6ec4798a6 Prevented list view filter box from setting dirty flag on form. Without this you get the save changes warning after using the filter, but there's nothing to save. 2014-08-13 22:11:41 +01:00
AndyButland
096e10aad4 Moved list view no results message into table body as otherwise if you apply a filter that returns no results, you can't clear it again 2014-08-13 20:06:55 +01:00
AndyButland
817d5aab0d Moved list view filter to repository, so can be applied with a database query 2014-08-13 20:02:51 +01: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
AndyButland
a71bfaa14c Amends to generated SQL pre-paging to ensure only the latest content versions are returned 2014-08-12 23:32:13 +01: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
AndyButland
dc32138006 Set up database level paging for retrieving child content for list view 2014-08-12 08:15:43 +01: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