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

22091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Sebastiaan Janssen
94cfbaf0ab Merge pull request #2710 from madsoulswe/temp-U4-11461 
U4-11461 - Add OEmbed support for Twitter.com
 2018-06-20 13:52:46 +02:00
Dennis Öhman
042db06ba1 Added twitter obembed 2018-06-20 13:39:12 +02:00
Shannon Deminick
4f04692afa Merge pull request #2707 from umbraco/temp-U4-11341 
U4-11341 Content node tree collapse on random nodes level 3 or lower …
 2018-06-20 18:25:22 +10:00
Sebastiaan Janssen
9909b10edb Removes more unnecessary code from the tree syncing if we don't need to consider the start nodes 2018-06-20 09:26:09 +02:00
Sebastiaan Janssen
7fa66ed914 Merge pull request #2708 from ctolkien/temp-U4-11460 
U4-11460 - Use an OrdinalIgnoreCase for localdb instance lookups
 2018-06-20 09:01:53 +02:00
Chad Tolkien
66a40eb69f Use an OrdinalIgnoreCase for localdb instance lookups 2018-06-20 10:24:22 +10:00
Adam Prendergast
b5c86f1412 Documentation for recently merged UmbNodePreview 'alias' property (#2706) 2018-06-19 16:57:48 +02:00
Sebastiaan Janssen
4e6c4d6f7f U4-11341 Content node tree collapse on random nodes level 3 or lower after upgrade to 7.10.4 2018-06-19 16:08:11 +02:00
Sebastiaan Janssen
aa132b29ee Merge pull request #2682 from rasmusjp/feature/U4-3921-expand-tree 
Expand tree to current node on copy/move and when picking content
 2018-06-18 22:36:33 +02:00
Sebastiaan Janssen
3e12908332 Merge pull request #2681 from rasmusjp/fix/U4-10499-expand-collapse-icon-missing 
Fix missing expand/collapse tree icon when refreshing page
 2018-06-18 22:22:36 +02:00
Sebastiaan Janssen
b207d6a7ad Merge pull request #2680 from Mundairson/dev-v7-U4-11429 
U4-11429 Cleaning Umbraco.Web.UmbracoHelper (part 1)
 2018-06-18 22:20:12 +02:00
Sebastiaan Janssen
61bde607c7 Bumps version to 7.12 2018-06-18 21:53:13 +02:00
Sebastiaan Janssen
bd7608599b Merge pull request #2659 from jamescoxhead/U4-11272 
U4-11272 Added flexible dropdown property value converter
 2018-06-18 21:48:10 +02:00
Sebastiaan Janssen
a26663653e Merge pull request #2696 from BatJan/features/U4-11424-Use-umb-toggle-directive-permissions.tab 
Features/u4 11424 use umb toggle directive permissions.tab
 2018-06-18 20:54:26 +02:00
Sebastiaan Janssen
6cbc3367b1 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-06-18 12:05:28 +02:00
mvanhelmont
95301fbc2b add watchCollection to include totalpages 
this will ensure the directive update it selfs correctly when totalpages is changed by pagesize.
 2018-06-18 10:17:17 +02:00
Sebastiaan Janssen
c961ffcef2 Merge pull request #2704 from andyneil/dev-v7 
U4-11321 - Removed redundant autocomplete attribute
 2018-06-18 10:00:59 +02:00
Sebastiaan Janssen
f034fbccf9 Merge pull request #2701 from abryukhov/temp-U4-11430 
U4-11430 - adds new UI localization keys (ru-RU) for v7.11
 2018-06-18 09:58:03 +02:00
Andy Neil
65d9b3b99d U4-11321 - Remove unused "autocomplete" attribute 2018-06-17 16:03:02 +01:00