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

20888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
1fc49ccf59 Merge remote-tracking branch 'origin/temp-U4-10299' into dev-v7.7 
# Conflicts:
#	src/Umbraco.Web/Trees/LegacyTreeParams.cs
 2017-08-18 14:11:41 +10:00
Shannon
7184838546 U4-10278 Administrator user group is missing access to Forms section 2017-08-18 12:02:52 +10:00
Shannon
254d4e2067 updates to latest examine 2017-08-18 11:54:39 +10:00
Shannon
2817a77c5a Null check fix - required for old trees, fixes backwards compat shim for AddApplication 2017-08-18 11:15:23 +10:00
Shannon
7b61070f8e COU-610 addApplication method is no longer available - puts back some backward compat hacks 2017-08-18 10:13:23 +10:00
Stephan
a157e1d596 Revert PublishedContentWrapped.Content rename 2017-08-17 20:40:32 +02:00
Claus
5a1fc91f3e simplified it a bit. 2017-08-17 12:50:15 +02:00
Robert
5e6b5a5cc1 Added a check so it's not possibile to delete the texboxes that are set as minimum 2017-08-17 12:09:20 +02:00
Robert
7213e3a6a0 Adding and removing text boxes should work properly now 
Thanks Mads :)
 2017-08-17 12:06:32 +02:00
Claus
f2ff1636ff ensuring query string is cleaned when switching sections with no custom routePath. 2017-08-17 11:23:08 +02:00
Claus
9169e64e39 cleanup and annoying line endings. 2017-08-17 11:22:05 +02:00
Mads Rasmussen
217ca62ea0 Merge pull request #2099 from bjarnef/dev-v7-U4-10152 
U4-10152 - Fix typo in localization of placeholder text
 2017-08-17 11:09:40 +02:00
Mads Rasmussen
d216d5755c Merge pull request #2094 from skttl/patch-6 
U4-10225: Notification banner floats above context menu
 2017-08-17 10:55:37 +02:00
Claus
8db748b738 Merge pull request #2123 from umbraco/temp-U4-7382-2 
U4-7382 Text Properties Containing JSON Are Corrupted on Publish
 2017-08-17 10:43:51 +02:00
Mads Rasmussen
9b1fa2ee23 Merge pull request #2134 from umbraco/temp-U4-10256 
U4-10256 Make umb-box component + add documentation
 2017-08-17 09:20:04 +02:00
Mads Rasmussen
f925309e1f Merge branch 'dev-v7.7' into temp-U4-10256 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
 2017-08-17 09:07:29 +02:00
Shannon
a50386aaf1 fixes test 2017-08-17 14:36:52 +10:00
Shannon
777d634fe2 Merge branch 'dev-v7.7' of https://github.com/umbraco/Umbraco-CMS into dev-v7.7 2017-08-17 12:18:23 +10:00
Shannon
049435a5e6 Puts back some APIs on the IUser interface to try to avoid more breaking changes. 2017-08-17 12:18:08 +10:00
Shannon
300c9aa258 fix test 2017-08-17 12:10:34 +10:00
Shannon
f7097d571c U4-10301 Change the PluginManager hash to use more reliable and consistent hashes 2017-08-17 11:38:57 +10:00
Mads Rasmussen
87f4cd24a0 fix link 2017-08-16 21:40:35 +02:00
Mads Rasmussen
b151c39c3b Merge pull request #2097 from skttl/patch-9 
U4-10232 Unsaved changes alert overlaps borders
 2017-08-16 16:15:49 +02:00
Zsolt
9e0d0de846 created documentation for the newly added directives + testing 2017-08-16 15:45:57 +02:00
Mads Rasmussen
b5acd53889 Add a bit of text formatting to the content templates intro text + describe how to add content templates from the settings section 2017-08-16 13:59:35 +02:00
Claus
ff29493203 missing null check causing legacy trees to break if theres no querystring data. 2017-08-16 13:43:48 +02:00
Claus
5fff884798 making sure title is added to trees.config - not sure if its needed but lets just do it. 2017-08-16 13:43:21 +02:00
Claus
3885454b26 updating name of usersResource for v. 7.7 2017-08-16 13:42:19 +02:00
Mads Rasmussen
fec85491b6 Merge pull request #2129 from umbraco/temp-U4-10248 
U4-10248 Change content and media start node pickers to use new picker layout
 2017-08-16 09:27:20 +02:00
Mads Rasmussen
26e590a260 don't wait for node path to return before we show the picked node in the UI 2017-08-16 09:25:22 +02:00
Zsolt
bf2fdc409b created umb-box components and changed all html tags for it in the users section 2017-08-15 16:32:30 +02:00
Zsolt
bd0cceb517 Clean-up with Mads 2017-08-15 14:41:04 +02:00
Claus
bb01eca7b7 added a few tests for the new UmbracoHelper methods. 2017-08-15 13:08:30 +02:00
Claus
542406c402 Merge pull request #2130 from umbraco/temp-U4-10136 
U4-10136 Broken link to package action documentation
 2017-08-15 11:02:52 +02:00
Claus
c44b903261 changed to private structs and made immutable. 2017-08-15 10:10:40 +02:00
Shannon Deminick
b02b130793 Merge pull request #2125 from umbraco/temp-U4-10280 
U4-10280 Add markers to required fields in user section
 2017-08-15 12:36:07 +10:00
Shannon Deminick
d3e73e9e30 Merge pull request #2122 from umbraco/temp-U4-10243 
U4-10243 Umbraco 7.7.  Difference between "Enable/Disable" and "LockedOut"
 2017-08-15 12:31:50 +10:00
Shannon
1de79cf473 updated to use ASPNET Identity APIs for managing lockouts 2017-08-15 12:31:32 +10:00
Shannon
42d65a36bc Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-08-15 11:55:17 +10:00
Bjarne Fyrstenborg
c68d7a33ca Fix maxchars javascript errors on macro parameter editors 2017-08-14 19:57:28 +02:00
Robert
2773102441 Fixed tag 2017-08-14 14:58:48 +02:00
Claus
ef0d6eff2c Merge pull request #2124 from umbraco/mikecp-U4-8967 
U4-8967 Linkpicker localization issue
 2017-08-14 14:58:31 +02:00
Robert
1efad78214 Package-actions link updated 2017-08-14 14:58:05 +02:00
Claus
46b2d8a4aa implement equality comparison to prevent duplicates in when used in dictionaries. 2017-08-14 13:34:47 +02:00
Zsolt
69c242074a In cms I changed the media picker to the new layout + deleting previously commented code 2017-08-14 13:08:01 +02:00
Claus
7a5cb7058b U4-10289 IdkMap cache can cause the entity service to return invalid results 2017-08-14 11:38:13 +02:00
Harvey Williams
13f76d2af9 Updated ReplaceLineBreaksForHtml to include \r 
I was surprised when this method did not replace a `\r` character with an HTML break. I have updated it to not only replace `\n`, but also `\r\n` and just `\r`.

I think these cases should be considered because of [this SO thread](https://stackoverflow.com/questions/4824621/is-a-new-line-n-or-r-n).

The updated code will not replace `\n\r` with one break but with two.

I used [this SO answer](https://stackoverflow.com/a/8196219/2963111) to update the method.

```
[TestMethod]
public void ReplaceLineBreaksForHtmlTest()
{
    var result = "foo\rbar\nbaz\r\nbiff\n\r".ReplaceLineBreaksForHtml();

    Assert.AreEqual(result, "foo<br />\rbar<br />\nbaz<br />\r\nbiff<br />\n<br />\r");
}
```
 2017-08-11 11:42:35 +01:00
Mads Rasmussen
f426e3c500 U4-10280 Add markers to required fields in user section 2017-08-11 12:14:10 +02:00
Claus
028576d93c Merge pull request #2120 from umbraco/temp-U4-10227 
U4-10227 Users section should start in the user tree
 2017-08-11 10:31:20 +02:00
Robert
c1c2339827 U4-8967 Linkpicker localization issue 
Did a few modifications to the PR - reverted back the default translations for "content_nodeName" and "content_urls" as they are being used in other places.
To fix this, I have created two new keys that are used only in the linkpicker :)
 2017-08-11 10:31:04 +02:00