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

6880 Commits

Author SHA1 Message Date
Sebastiaan Janssen
b9d7046bbc Merge pull request #2788 from nathanwoulfe/temp-U4-6946 
Updating #2742 - U4 6946 - Existing template file is overwritten when creating a new template in the backoffice
 2018-07-19 10:28:24 +02:00
Sebastiaan Janssen
f622a9154b Merge pull request #2763 from OptimisticCoder/U4-7030-Using-radiobuttonlist-prevalue-editor 
U4-7030 enable use of radiobuttonlist pre editor
 2018-07-18 15:29:20 +02:00
leekelleher
7a9a4a2fab Fixes bug with comparing partial content paths 
Raised here in a comment by @coolmikkel
https://github.com/umbraco/Umbraco-CMS/pull/2253#issuecomment-405751083
 2018-07-18 10:54:19 +01:00
Nathan Woulfe
fe648c8069 get view content in service methods rather than controller 2018-07-18 14:27:18 +10:00
Sebastiaan Janssen
014e50a13a Merge pull request #2148 from LennardF1989/U4-10345 
Added possibilty to ignore collisions from an IContentFinder (U4-10345)
 2018-07-16 13:38:23 +02:00
Lee Kelleher
abf61417ad U4-10561 - Performance improvement for IsAncestor/IsDescendant extension methods (#2768) 2018-07-16 10:44:54 +02:00
Sebastiaan Janssen
1908725a9a Merge pull request #2742 from nathanwoulfe/temp-U4-6946 
U4 6946 - Existing template file is overwritten when creating a new template in the backoffice
 2018-07-13 11:12:16 +02:00
Sebastiaan Janssen
b4a941e367 Merge pull request #2766 from Mundairson/dev-v7-U4-11509 
Correct Umbraco.Web.UmbracoHelper and tests to coding standards
 2018-07-12 13:17:47 +02:00
Sebastiaan Janssen
9e35748040 Merge pull request #2357 from Dexmoor/U4-10779 
U4-10779 Allow Members tree to work independently of Member Types tree
 2018-07-12 13:13:04 +02:00
Sebastiaan Janssen
c56dc63150 Merge pull request #2702 from nathanwoulfe/temp-U4-4732 
U4-4732 Anchor missing in TinyMCE of Umbraco 7.x
 2018-07-12 12:39:23 +02:00
Mundairson
583b25a85d Correct Umbraco.Web.UmbracoHelper and tests to be coding standards compliant. 2018-07-11 17:24:36 +01:00
Shannon
13d6dfd234 renames DictionaryTreeController to have the correct file name 2018-07-11 16:42:25 +10:00
Dan Patching
80412f56ee enable use of radiobuttonlist pre editor 2018-07-08 14:15:27 +01:00
Nathan Woulfe
416cea796e clean up usings 2018-07-06 09:38:00 +10:00
Nathan Woulfe
e34926acd6 check for existing file content when creating/saving new template 2018-07-06 09:38:00 +10:00
Sebastiaan Janssen
5f6fdc759a Merge pull request #2565 from leekelleher/U4-9088 
U4-9088 - Macro Container Property Type returned incorrect object-type
 2018-06-28 20:33:50 +02:00
Sebastiaan Janssen
00959a16cc Merge pull request #2585 from bjarnef/dev-v7-U4-11214 
U4-11214 - Display member type name in heading
 2018-06-28 20:32:26 +02:00
Sebastiaan Janssen
0a29ad3d21 Merge pull request #2570 from AndyButland/u4-10502 
U4-10502 - resend of user invitations
 2018-06-28 20:28:24 +02:00
Sebastiaan Janssen
8c815554da Merge pull request #2583 from dontbesorry80/U4-11198 
Allow capital letters for email address entry in RegisterModel
 2018-06-28 20:25:28 +02:00
Dan Booth
f083a33d92 U4 10778 - FirstChild<T> extension returns IPublishedContent rather than model of type T (#2623) 2018-06-28 20:09:54 +02:00
Sebastiaan Janssen
f7517fa64b Revert whitespace changes and csproj file 2018-06-28 20:01:44 +02:00
Anders Brohus
9c8d73dcfa U4-11372 - Make history section on Info tab translatable (#2650) 2018-06-28 19:49:28 +02:00
OptimisticCoder
ffd0adb0f3 U4-9544 Added database schema validation health check and language file updates. (#2674) 2018-06-28 19:37:28 +02:00
Robert
385f1d6689 Merge pull request #2604 from umbraco/temp-U4-11276 
Implements doc type collections | connects #73
 2018-06-26 23:58:35 -07: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
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
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
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
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
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
Nathan Woulfe
bb28d3f4a9 extend contentcontroller to allow udi or guid params for getbyid, which also requires extending the attribute for the different param types 2018-06-17 20:06:39 +10:00
Shannon Deminick
7372fa1705 Merge pull request #2627 from efabioli/patch-1 
U4-11329 - GetExternalAuthenticationOptions gets called when AuthType is Null in Umbraco.Web/editors/BackOfficeController.cs
 2018-06-14 14:31:27 +10:00
Ed Parry
0e4bcc96e7 U4-9367 Refined context menu for content in the recycle bin (#2687) 2018-06-13 21:38:03 +02:00
Enkel Media
8d41d106d0 Fixes #U4-11406 by setting the thread culture before rendering macro (#2666) 2018-06-13 21:06:58 +02:00
Sebastiaan Janssen
d66e951b68 Updating code style, removes obsolete files, now we can move the tree to the Translation section 2018-06-13 20:20:21 +02:00
Dave Woestenborghs
9c33f1b1c9 U4-5683 Migrate Dictionary tree & editor to angular (#2159) 2018-06-13 20:19:18 +02:00
Rasmus John Pedersen
66b0d4e3b6 Expand tree to current node on copy/move and when picking content 2018-06-10 14:01:32 +02:00
Mundairson
74ce567702 The default for a class is null anyway. 2018-06-10 12:03:09 +01:00
Mundairson
0571970a92 Remove the double cast. 2018-06-10 12:01:43 +01:00
Mundairson
0745ed87c2 Convert GUID and UDI methods to pattern matching. 2018-06-09 16:40:51 +01:00
Mundairson
c3d7bd5fdf Add tests to refactor the GUID and UDI convert methods. 2018-06-09 16:36:49 +01:00
Mundairson
b60e7246fb Converted to simple pattern matching. 2018-06-09 16:02:51 +01:00
Mundairson
73d6f81d67 Add tests before refactoring. 2018-06-09 16:01:15 +01:00
Mundairson
9e9648cbb8 Removed unused using declarations and changed tabs to spaces. 2018-06-09 15:27:57 +01:00
Mundairson
34b2349cd7 Clean the AssignedContentItem property. 2018-06-09 15:26:40 +01:00
Marc Goodson
0eceb3c7fc U4-11369 - Add list of content types where a composition content type is used to compositions dialog (#2668) 2018-06-06 22:35:10 +02:00
Sebastiaan Janssen
d8ba0d352e Merge pull request #2633 from maarten-kieft/dev-v7 
Make base AnchestorOrSelf public
 2018-06-06 09:58:55 +02:00
Claus
ccc8868f68 fixes U4-11338 Language dropdown fails when invalid cultures are present 2018-06-01 13:06:13 +02:00