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

22074 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Woulfe
ee0888e58c updates to make it all work - event from the notification determines the action 2018-06-28 10:21:41 +10:00
Nathan Woulfe
7aa47f32c4 new notification view + controller for confirming unpublish 2018-06-28 10:19:26 +10:00
Nathan Woulfe
70aeb1c09d add en variants for unpublish notification 2018-06-28 10:13:01 +10:00
Nathan Woulfe
bf9a336344 correct notifications positioning on smaller screens - was hidden behind the left nav 2018-06-28 10:12:40 +10: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
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
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