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

22110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Russell
c0b094f2e8 Fix http://issues.umbraco.org/issue/U4-8887 
The only usage of __mcenew id is to change the HTML when there is size set on the element. This is done on the timeout function.
As per suggestion - "we wipe the ID in $timeout then, regardless the maxSize"
 2018-06-27 10:06:45 +12:00
Sebastiaan Janssen
d2500b36d3 Merge pull request #2728 from BatJan/patch-2 
Adjusting danish translations
 2018-06-26 20:15:43 +02:00
BatJan
476e33bf40 Changed "Denne tekst vil blive brugt..." to "Denne tekst bruges..." 
Lowering the lix count for the sentence :-)
 2018-06-26 20:04:40 +02:00
BatJan
59d68a7fdc Changed "antaller" to "antal 2018-06-26 20:02:25 +02:00
Sebastiaan Janssen
083a34275e Merge pull request #2727 from readingdancer/U4-11482 
Fix for U4 11482 - Adding space before the character counter.
 2018-06-26 19:59:39 +02:00
BatJan
b3d2e49f1a Adjusting translations 
I just noticed a few untranslated words and I also took the liberty to change the translation of "grid" to "gitter" and translate it back to english. "Gitter layout" is not something we say in dansih we simply adopt the english word "Grid" :-)
 2018-06-26 19:29:09 +02:00
Chris Houston
bbe15b69b7 Merge branch 'U4-11482' of https://github.com/readingdancer/Umbraco-CMS into U4-11482 2018-06-26 13:17:50 -04:00
Chris Houston
3371360bc7 Adding a small space between the text box & text area fields and the help text ( which is the character counter ) underneath. 2018-06-26 13:16:06 -04:00
Chris Houston
9fb1ce534b Adding a small space between the text box & text area fields and the help text ( which is the character counter ) underneath. 2018-06-26 13:14:39 -04:00
Sebastiaan Janssen
a4d9790279 Merge pull request #2718 from ed-parry/temp-U4-10839 
U4-10839: Backoffice password field 'eye' icon overlaps with password manager icons
 2018-06-26 18:29:14 +02:00
Ed Parry
f6efbcf99f Added the Danish translations. 2018-06-26 16:26:15 +01:00
Ed Parry
1ac62dcee7 Added prevent default on the a tag. 2018-06-26 15:33:37 +01:00
Sebastiaan Janssen
ad81b193a2 Merge pull request #2726 from ProNotion/issues/U4-11312 
Issues/u4 11312
 2018-06-26 13:29:46 +02:00
Simon Dingley
f8f94eae32 Merge branch 'dev-v7' into issues/U4-11312 2018-06-26 12:00:42 +01:00
Simon Dingley
4724230d2c U4-11312 Provides a fallback AuditType value of AuditType.Custom for any legacy logHeader column values that cannot be parsed 2018-06-26 11:59:05 +01:00
Sebastiaan Janssen
1bb593d264 Merge pull request #2725 from abjerner/patch-40 
U4-11477 Improves URL not being populated in the RTE link media picker when searching for content
 2018-06-25 23:57:11 +02:00
Anders Bjerner
dd49febd77 U4-11477 Here we go again 
https://github.com/umbraco/Umbraco-CMS/pull/2720#issuecomment-400106496
 2018-06-25 23:51:19 +02:00
Sebastiaan Janssen
f2aa1ea95b Fixes Our reference to old .org domain 2018-06-25 14:50:56 +02:00
Sebastiaan Janssen
6fdc49fa28 Merge pull request #2721 from BatJan/patch-1 
Change description text
 2018-06-25 12:13:57 +02:00
Sebastiaan Janssen
be45237830 Merge branch 'patch-v7' into dev-v7 2018-06-25 12:10:11 +02:00
Anders Bjerner
ae3205c429 Fixes U4-11426 for files as well 
The original fix from #2679 only fixes the bug for images, as it checks whether the `umbracoWidth` and `umbracoHeight` properties are present. With this PR, the bug is now fixed for both images and regular files.
 2018-06-25 12:08:42 +02:00
Sebastiaan Janssen
1ad483df70 Merge pull request #2720 from abjerner/patch-39 
Fixes U4-11426 for files as well
 2018-06-25 12:06:55 +02:00
Sebastiaan Janssen
4626041aca Merge pull request #2716 from mvanhelmont/U4-11335 
U4-11335 Failed to retrieve data for media id undefined
 2018-06-25 11:46:16 +02:00
Sebastiaan Janssen
7e88696cbc Merge pull request #2705 from mvanhelmont/patch-3 
U4-11452 umbPagination directive does not update when pagesize dynamically changed
 2018-06-25 11:44:11 +02:00
Sebastiaan Janssen
f49d057262 Merge pull request #2712 from mvanhelmont/U4-11334 
U4 11334 Content type edit, click on icon always shows black empty icon
 2018-06-25 11:40:57 +02:00
Sebastiaan Janssen
8ef213547a Merge pull request #2606 from jamescoxhead/U4-11295 
U4-11295 Added filtering to Nested Content add doctype overlay
 2018-06-25 11:32:56 +02:00
Sebastiaan Janssen
35bbb5aae4 Fix unit test 2018-06-25 08:59:08 +02:00
Sebastiaan Janssen
d02a8c0a59 Merge branch 'patch-v7' into dev-v7 2018-06-25 08:31:10 +02:00
Joshua Pease
10c71a7381 Set a initial $scope.model.value for true/false 2018-06-25 08:24:22 +02:00
Sebastiaan Janssen
5c275df83c Merge pull request #2717 from joshuapease/temp-U4-11474 
U4-11474: Bugfix - Umbraco.TrueFalse default value is not being stored in database
 2018-06-25 08:22:23 +02:00
BatJan
323954243b Change description text 
I changed the description text since it's no longer necessary to make a custom value converter when selecting the JSON option. It's handled out of the box now.

**The original text**
"Select whether to store the tags in cache as CSV (default) or as JSON. The only benefits of storage as JSON is that you are able to have commas in a tag value but this will require parsing the json in your views or using a property value converter"

**New text**
"Select whether to store the tags in cache as CSV (default) or as JSON. The only benefits of storage as JSON is that you are able to have commas in a tag value"
 2018-06-23 13:36:07 +02:00
Anders Bjerner
a9e9eb9bdd Fixes U4-11426 for files as well 
The original fix from #2679 only fixes the bug for images, as it checks whether the `umbracoWidth` and `umbracoHeight` properties are present. With this PR, the bug is now fixed for both images and regular files.
 2018-06-22 19:09:20 +02:00
Ed Parry
f62b7dd4fd Reduced spacing between text and icon. 2018-06-22 12:24:59 +01:00
Ed Parry
ea9663fa22 Initial solution built and working. 2018-06-22 12:15:26 +01:00
Joshua Pease
35e3a39cc3 Set a initial $scope.model.value for true/false 2018-06-21 14:49:17 -07:00
Marcel
def3529f12 simple check for target id if not gotoStartNode 2018-06-21 20:05:01 +02:00
Sebastiaan Janssen
8e0b89801a Merge pull request #2713 from richarth/patch-1 
Spelling correction
 2018-06-21 15:20:57 +02:00
Richard Thompson
b16c5f3cdf Spelling correction 2018-06-21 11:34:58 +01:00
Sebastiaan Janssen
677f22b008 Merge branch 'patch-v7' into dev-v7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2018-06-21 11:05:05 +02:00
Sebastiaan Janssen
9875c37cf2 Bumps version to 7.11.1 2018-06-21 10:48:25 +02:00
Sebastiaan Janssen
67e36a0d60 U4-11456 Package installation - Load usercontrol: file cannot be found: /umbraco/developer/Packages/installer.aspx 2018-06-21 10:38:04 +02:00
Sebastiaan Janssen
bcca0528c0 U4-11462 Error when using Simple Injector - 'The Tree controller is missing the Umbraco.Web.Trees.TreeAttribute attribute' 2018-06-21 08:19:53 +02:00
Marcel
768e360853 mark icon as selected instead off using search for it. 2018-06-20 20:18:14 +02:00
Marcel
2af5cf97ef show selected icon and set selected color on editing icon 2018-06-20 18:59:01 +02:00
Sebastiaan Janssen
f420f7a870 Merge pull request #2610 from ProNotion/issues/U4-11296 
Fixes U4-11296 allowing nulls to be stored in the comment column of the umbracoConsent table
 2018-06-20 17:12:02 +02:00
Sebastiaan Janssen
6116161fef Fix up csproj file and moves migration to v7.12 2018-06-20 17:06:43 +02:00
Sebastiaan Janssen
cf6fc2ec78 Merge branch 'issues/U4-11296' of https://github.com/ProNotion/Umbraco-CMS into ProNotion-issues/U4-11296 2018-06-20 16:57:55 +02:00
Sebastiaan Janssen
4f2b7411e9 Merge branch 'patch-v7' into dev-v7 2018-06-20 16:57:15 +02:00
Sebastiaan Janssen
359201955a Merge pull request #2629 from umbraco/temp-U4-11339 
Fixes - User permissions does not work in listview in 7.10.4
 2018-06-20 15:39:56 +02:00
Robert
ce2e8a147e Removed meaningless v2 variabile 2018-06-20 14:35:48 +02:00