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

19399 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
4404ce94c5 Merge pull request #2142 from abjerner/patch-17 
Typo
 2017-08-21 14:24:52 +02:00
Anders Bjerner
86bc701511 Typo 
Very minor typo, but still ;)
 2017-08-21 14:16:01 +02:00
Robert
54f86c06f0 Fix TruncateByWords to work with tags 2017-08-21 12:30:16 +02:00
Stephan
a86902bd91 Merge pull request #2128 from umbraco/temp-U4-10289 
U4-10289 IdkMap cache can cause the entity service to return invalid …
 2017-08-18 21:45:35 +02:00
Mads Rasmussen
7bdf76ffa7 Merge pull request #2098 from bjarnef/dev-v7-U4-10242 
U4-10242 - Remove bottom margin of subtitle paragraph
 2017-08-18 14:21:08 +02:00
Claus
528656a337 using val.value directly. 2017-08-18 11:44:44 +02:00
Mads Rasmussen
5ef46ad8df Merge pull request #2048 from umbraco/temp-U4-7497 
Pressing Enter/Backspace in repeatable text strings now adds/removes text boxes
 2017-08-18 11:34:52 +02:00
Mads Rasmussen
168dc0e5da small UX refinements 2017-08-18 11:24:51 +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
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
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
b151c39c3b Merge pull request #2097 from skttl/patch-9 
U4-10232 Unsaved changes alert overlaps borders
 2017-08-16 16:15:49 +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
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
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
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
Shannon
0e273d1a08 U4-7382 Text Properties Containing JSON Are Corrupted on Publish 2017-08-11 15:11:53 +10:00
Mads Rasmussen
125c378274 fixes: U4-4848 If "Save and Publish" is clicked before page finishes loading, data is lost from MNTP 2017-08-10 14:11:48 +02:00
mikkelhm
ca80a0cddc Bump version to 7.6.6 2017-08-10 08:41:06 +02:00
Shannon
21707f9e08 Updates the GetMemberGroupsForMember with a username to be a single query 2017-08-10 14:22:30 +10:00
Shannon
d8cfd8f12e U4-10274 Umbraco.MemberHasAccess isn't cached 2017-08-10 13:46:18 +10:00
Mads Rasmussen
08150c05e9 Merge pull request #1971 from Bitmapped/U4-9977 
Fix U4-9977
 2017-08-09 13:28:04 +02:00
Mads Rasmussen
688f8c4170 Merge pull request #2053 from bjarnef/dev-v7-U4-10161 
U4-10161 - Update localization of email
 2017-08-09 11:51:05 +02:00
Mads Rasmussen
31cbb79ede Translate zip-code 2017-08-09 11:48:15 +02:00
Shannon Deminick
305ce84ef5 Merge pull request #2111 from umbraco/temp-U4-10266 
U4-10266 Package installer need to handle files before handling entities
 2017-08-09 19:47:45 +10:00
Shannon
c6d7056a64 Updated to return nulls as opposed to the ex being caught with a meaningful message 2017-08-09 19:44:37 +10:00
Bitmapped
7db1055a0d Remove JSON files, which appear to be unnecessary. 2017-08-08 13:54:36 -04:00
Claus
d625388786 U4-10266 Package installer need to handle files before handling entities 2017-08-08 13:10:33 +02:00
Claus
fa1663ed51 Fixes build script to work with VS 2017 (only) and fixes BuildBelle since it didn't work and is missing tools 2017-08-08 13:08:29 +02:00
mikkelhm
ca0de5acd3 Fix more xml format issues in pl.xml 2017-08-07 21:58:45 +02:00
mikkelhm
27168722ab fix xml in pl.xml 2017-08-07 20:33:49 +02:00
Per Ploug
babcbd2f7a Updates from dev-v7 2017-08-07 15:29:34 +02:00
Per Ploug
ba82885b6d Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into temp-gulp-spike 
# Conflicts:
#	build/BuildBelle.bat
 2017-08-07 14:05:53 +02:00
Sebastiaan Janssen
6dbeba0763 Merge pull request #2103 from ronaldbarendse/U4-10252 
U4-10252: Slider property editor initial values not used when equal (range enabled)
 2017-08-07 08:10:49 +02:00
Ronald Barendse
00e0f83c8e Fixed U4-10252 
Umbraco.Slider property editor did not use the correct initial values
when range was enabled and both values were equal.
 2017-08-06 22:41:20 +02:00
Bjarne Fyrstenborg
68ba0ca1e2 Fix typo in localization of placeholder text 2017-08-03 21:45:01 +02:00
Bjarne Fyrstenborg
b22e9d0911 Remove bottom margin of subtitle paragraph 2017-08-03 21:35:03 +02:00
Søren Kottal
6a59a90964 Moves .alert-form.-no-border slightly 
Moves .alert-form.-no-border slightly, so borders beneath are visible
 2017-08-02 20:49:20 +02:00