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

16533 Commits

Author SHA1 Message Date
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
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
Søren Kottal
26a042f291 U4-10225: Bumps z-index of #leftcolumn 
http://issues.umbraco.org/issue/U4-10225

This bumps the z-index of #leftcolumn, so the notifications don't get in the way.
 2017-08-02 19:41:55 +02:00
Sebastiaan Janssen
136b3db098 Merge pull request #2071 from umbraco/temp-U4-10123 
U4-10123 Make sure the backoffice login is not susceptible to DOS att…
 2017-08-01 17:16:31 +02:00
Sebastiaan Janssen
21f46d0a3c Adds debug level logging for failed attempts to get filestream 2017-08-01 09:16:39 +02:00
Stephan
86c37c7f6d PluginManager - fix 2017-07-31 16:38:39 +02:00
Stephan
7dd9f3e766 PluginManager - implement retries on list file 2017-07-31 16:24:22 +02:00
Alexander Bryukhov
6c91d54372 U4-10200 Listview layouts - empty state not localized 2017-07-26 10:24:03 +07:00
Stephan Lonntorp
d4a2244190 Added missing translations 2017-07-25 13:28:46 +02:00
Shannon
1ccc8cc161 U4-10123 Make sure the backoffice login is not susceptible to DOS attacks 2017-07-25 19:40:30 +10:00
Stephan
c5e7e1e39e U4-10144 - dont break again 2017-07-24 14:05:04 +02:00
Shannon
db2a35dbce fixes a localized key that doesn't exist 2017-07-24 20:23:54 +10:00
akierczynska
e0c891719f Update pl.xml to match en.xml 
Updating pl.xml with new keys to match en.xml
 2017-07-24 00:04:11 +01:00
Sebastiaan Janssen
89a14c13e5 Merge pull request #2060 from soreng/patch-4 
Changed name of argument in validation
 2017-07-21 15:14:33 +02:00
Sebastiaan Janssen
ca9aa21c7b Merge pull request #2064 from pijemcolu/temp-U4-10187 
U4-10187 - Fix link to training in Backoffice -> Settings->Dashboard
 2017-07-21 14:42:49 +02:00
Stephan
14de3fee46 Merge branch dev-v7 into temp-u4-10006 2017-07-21 13:27:56 +02:00
Stephan
c0eaeb3168 Fix tests with issues 2017-07-21 13:06:23 +02:00
pijemcolu
74e16c0f8d fix link to training in Settings->Dashboard 2017-07-21 10:14:07 +02:00
Stephan
17d3548bbb Merge branch dev-v7 into temp-u4-10006 2017-07-21 10:04:25 +02:00
Stephan
f8fac9f84e U4-9430 - fix 2017-07-20 10:21:21 +02:00
Stephan
83ce359234 Merge pull request #1992 from Bitmapped/U4-9430 
U4-9430 Fix
 2017-07-20 10:20:06 +02:00
Søren Gregersen
2c64f91b25 Changed name of argument in validation 
Minor change... :)
 2017-07-19 22:23:22 +02:00
Sebastiaan Janssen
e702fe2877 Merge pull request #2055 from dawoe/patch-2 
Fix value converter work for legacy media picker
 2017-07-19 12:31:46 +02:00
Stephan
d57de05453 U4-10128 - super improve 2017-07-19 12:24:00 +02:00