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

22049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
4f2b7411e9 Merge branch 'patch-v7' into dev-v7 2018-06-20 16:57:15 +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
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
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
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
Alexander Bryukhov
77f0b4e093 U4-11430 - couple of typos 2018-06-16 16:25:16 +07:00
Alexander Bryukhov
59e291f961 U4-11430 - slightly better health check keys translation 2018-06-16 16:23:11 +07:00
Alexander Bryukhov
50e4825066 U4-11430 - adds new UI localization keys (ru-RU) for v7.11 2018-06-16 15:59:57 +07:00
Sebastiaan Janssen
4235963fce Fix configuration errors 2018-06-14 15:32:38 +02:00
Sebastiaan Janssen
7d2bbb64b1 Fix configuration errors 2018-06-14 15:22:22 +02:00
Jan Skovgaard
785dc4864a Switch the old checkbox to use the umb-toggle directive in the views instead. Added a toggle function to deal with this in each of the two controllers 2018-06-14 12:33:48 +02:00
Sebastiaan Janssen
07ccdfb7af Removes hacky way to get the section name and replaces it with the normal way to get it 2018-06-14 12:01:29 +02:00
Jan Skovgaard
02a00eca49 Merge branch 'dev-v7' of https://github.com/BatJan/Umbraco-CMS into dev-v7 2018-06-14 10:59:42 +02:00
Jan Skovgaard
12ea56261f Replaced the old checkbox with the umb-toggle button. It behaves the same as before but looks nicer :-) - Also removed some unsued references from the code in the directive. 2018-06-14 10:59:09 +02:00
Sebastiaan Janssen
2022ca6d64 Merge pull request #2694 from dampee/feature/U4-11438 
U4-11438 Add issuu.com oembed functionality
 2018-06-14 10:29:19 +02: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
Damiaan
9ec1d20d51 U4-11438 Add issuu.com oembed functionality + fixed typo's in EmbeddedMedia.config file 2018-06-13 22:20:11 +02:00
Ed Parry
0e4bcc96e7 U4-9367 Refined context menu for content in the recycle bin (#2687) 2018-06-13 21:38:03 +02:00
Sebastiaan Janssen
82c7bc45a7 Merge pull request #2640 from lars-erik/U4-7874 
U4-7874 - Add events to content editor
 2018-06-13 21:30:10 +02:00
Sebastiaan Janssen
10484a2240 Fix unit tests after moving the Dictionary tree 2018-06-13 21:16:44 +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
8e18778bc2 Merge pull request #2675 from bjarnef/dev-v7-U4-11301 
Add id and guid on datatype pages
 2018-06-13 21:04:19 +02:00
Sebastiaan Janssen
8068641120 Merge pull request #2679 from stephen47/temp-U4-11426 
U4-11426 - Fixed bug with media picker not populating URL in RTE link editor when search is used.
 2018-06-13 20:58:18 +02:00
Jan Skovgaard
b08343fe76 Replaced the old checkbox with the umb-toggle button. It behaves the same as before but looks nicer :-) - Also removed some unsued references from the code in the directive. 2018-06-13 20:55:52 +02:00
Sebastiaan Janssen
388f9e3a1e Merge pull request #2685 from abryukhov/temp-U4-11430 
U4-11430 - Backoffice UI localization update (ru-RU)
 2018-06-13 20:48:55 +02:00
Adam Prendergast
51b77669cb U4-11437: Added 'Document Type Alias' title to appear on mouse hover … (#2692) 2018-06-13 20:46:45 +02:00
Garrit Petersen
f04335ef7d cursor remians default when no alias is given to the umb-control-grou… (#2497) 2018-06-13 20:42:21 +02:00
Sebastiaan Janssen
aca0249c0f NuGet install now creates the correct tree controller 2018-06-13 20:29:55 +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
Daniël Knippers
3520f2d1e4 Fix NullReferenceException when HttpContext is null 
This method will throw a NullReferenceException in contexts without an HttpContext, like is the case in background threads. As HttpContext is only used to set an isDebug flag, it seems more sensible to not throw in cases without an HttpContext, but simply set isDebug to false instead. If this is not acceptable behavior, could we perhaps look at something other than HttpContext.Current.IsDebuggingEnabled to decide whether isDebug should be set?
 2018-06-13 13:25:10 +02:00
Rasmus John Pedersen
5e3a8b4694 Only call updateNodeData if there's children 
Also there's no need to send the node to the function
since it's the same node, so better save some compute
power there too
 2018-06-12 20:09:10 +02:00
Rasmus John Pedersen
e034bd4a1f Update tree node when children are loaded 
This fixes the expand/collapse icon not being show when a tree
is autoexpanded, e.g. when refreshing the page
 2018-06-12 16:39:42 +02:00
Claus
2715d49630 Merge pull request #2498 from hemraker/temp-U4-10899 
Fixes U4-10899: Template circular dependency
 2018-06-12 13:04:23 +02:00
Alexander Bryukhov
78fe1015aa U4-11430 - Backoffice UI localization update (ru-RU) 2018-06-11 17:16:49 +07: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
a63b3889e7 Run the plugin set up before the UDI tests so the types are there. 2018-06-09 17:15:26 +01:00
Mundairson
72e0eabb4b Reset the UDI types before each unit test. 2018-06-09 16:57:58 +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