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

20913 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
abbcf0e26b Merge pull request #2358 from abjerner/patch-28 
Triggers the save button to momentarily show an error icon
 2018-01-22 14:55:10 +01:00
Sebastiaan Janssen
347b25472f Merge pull request #2403 from JimBobSquarePants/housekeeping-gitattributes 
Add default gitattributes and cleanup editorconfig
 2018-01-22 14:38:40 +01:00
Mads Rasmussen
b745948dc6 Merge pull request #2361 from bjarnef/dev-v7-U4-10791 
U4-10791 - Fix collapsed columns listview settings
 2018-01-22 13:48:58 +01:00
Mads Rasmussen
8007c8869f Merge pull request #2401 from umbraco/temp-U4-10835 
U4-10835 Adds context menu items to the User tree
 2018-01-22 13:25:59 +01:00
Stephan
b51a328ead Merge pull request #2402 from JimBobSquarePants/perf-tryconvertto 
Performance - 8x Faster TryConvertTo
 2018-01-22 13:22:22 +01:00
James Jackson-South
f3b8f2eb5f Add default gitattributes and cleanup editorconfig 2018-01-22 21:44:08 +11:00
James Jackson-South
de4628f450 Add perf explanation 2018-01-22 20:58:15 +11:00
James Jackson-South
b0a64655b4 Fastest dictionary lookups 2018-01-22 16:43:02 +11:00
Stephan
48d88ec8fa Deal fix FIXME 2018-01-21 10:29:06 +01:00
Stephan
7ca151a3fa Use concurrent dictionaries 2018-01-21 10:18:13 +01:00
Stephan
363c8fab2c Cleanup 2018-01-21 10:03:17 +01:00
Stephan
8d4fd9d1cf Merge branch 'perf-tryconvertto' of https://github.com/JimBobSquarePants/Umbraco-CMS into perf-tryconvertto 2018-01-21 10:01:12 +01:00
James Jackson-South
24071eb3b1 Faster TryConvertTo 2018-01-20 14:54:52 +11:00
James Jackson-South
62ffbe7cf0 Cleanup benchmarks and add TryCOnvertTo 2018-01-20 13:00:10 +11:00
Warren Buckley
f2d6b47e47 Update labels for context menu items to be just 'Create' & 'Invite' to keep the same consistency throughout the UI as other context menu items do not include the verb 2018-01-19 14:24:57 +00:00
Warren Buckley
f3541908c7 Update Users tree context menu to include two new items that navigate directly to an Angular Location/Path which loads the Invite or Create User views as needed 2018-01-19 14:07:23 +00:00
Sebastiaan Jansssen
4e57e1cc18 Nicer variable name, thank to Lee Kelleher! 2018-01-19 12:50:45 +01:00
Sebastiaan Jansssen
410afffaa9 Optimizing use of newlines array 2018-01-19 12:42:04 +01:00
Claus
936e94789d adding to tinyMceConfig.Release.config. 2018-01-19 12:21:57 +01:00
Claus
468a56e5de Merge branch 'karltynan-dev-v7' into dev-v7 2018-01-19 11:11:53 +01:00
Claus
468ec8824a Merge branch 'dev-v7' of git://github.com/karltynan/Umbraco-CMS into karltynan-dev-v7 2018-01-19 11:11:13 +01:00
Sebastiaan Jansssen
cad913b7a1 U4-10857 Update to ClientDependency 1.9.5 2018-01-19 08:26:34 +01:00
Sebastiaan Jansssen
382103d99d Bump version to 7.7.9 2018-01-19 08:26:33 +01:00
Sebastiaan Janssen
cbb6b9bca0 Merge pull request #2310 from matthew-darby/U4-10495 
U4-10495 - Install and customize buttons disabled
 2018-01-18 18:38:37 +01:00
Sebastiaan Janssen
a1b90a50cd Merge pull request #2343 from soreng/patch-5 
Fix for U4-10733
 2018-01-18 18:28:34 +01:00
Sebastiaan Janssen
9ea5855073 Merge pull request #2360 from janvanhelvoort/U4-10785 
U4-10785 - Filtering of Grid Editors
 2018-01-18 18:20:11 +01:00
Sebastiaan Janssen
4a37433042 Merge pull request #2372 from bjarnef/dev-v7-U4-10809 
Fix checkmark tree icon, when custom font icon is used for tree icon
 2018-01-18 18:00:53 +01:00
Sebastiaan Janssen
91469812d3 Merge pull request #2383 from MMasey/U4-10727 
U4 10727 - If nodes with an empty name exist, it's not possible to empty recycle bin
 2018-01-18 17:54:40 +01:00
Sebastiaan Janssen
68a8eb7f3f Merge pull request #2375 from redmorello/U4-10762 
U4-10762 Fix issue with empty name when registering new members from …
 2018-01-18 17:40:05 +01:00
Sebastiaan Janssen
2e7baabb94 Merge pull request #2394 from umbraco/temp-u4-10813 
U4-10813 - fix error with groups having a large number of permissions
 2018-01-18 17:27:11 +01:00
Sebastiaan Janssen
57745fe71d Merge pull request #2396 from leekelleher/issue/U4-10842 
U4-10842 LegacyMediaPickerPropertyConverter null-reference check
 2018-01-18 17:17:45 +01:00
Sebastiaan Janssen
de6f9236e7 Merge pull request #2399 from leekelleher/issue/U4-8712 
U4-8712 MultipleTextstring value newline delimiter changes
 2018-01-18 17:13:46 +01:00
Sebastiaan Janssen
a00c59e8b5 Merge pull request #2393 from umbraco/temp-u4-10079 
U4-10079 - remove default template
 2018-01-18 16:54:22 +01:00
Stephan
05c2da807f U4-10079 - fix test 2018-01-18 15:58:51 +01:00
leekelleher
0fd8ca43d6 U4-8712 MultipleTextstring value newline delimiter changes 
PR #2185 goes towards resolving this, but doesn't handle the impromptu switch between the `\r\n` and `\n` newline delimiters when republishing a content node.

Using an explicit array of newline chars will resolve this, e.g. `Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None)`

<http://issues.umbraco.org/issue/U4-8712>
 2018-01-18 12:18:51 +00:00
leekelleher
e466878925 U4-10842 LegacyMediaPickerPropertyConverter ConvertDataToSource null-reference check 
If a selected media node has been trashed on the source environment,
when Deploy comes to transfer the node ID, because it can't transfer the media dependency,
the node ID value is set to `null`.

This causes an issue for the `LegacyMediaPickerPropertyConverter`
and `ConvertDataToSource` throws a null-reference exception.

This patch adds in a null-reference check for the `source` value.

<http://issues.umbraco.org/issue/U4-10842>
 2018-01-18 10:04:55 +00:00
Mikulas Tomanka
319acc199e Merge pull request #2391 from matthew-darby/U4-10825 
U4-10825 Search member by email in member section
 2018-01-17 14:18:43 +01:00
Stephan
2a982f21a7 U4-10813 - fix error with groups having a large number of permissions 2018-01-17 13:07:03 +01:00
Stephan
3ff455f11d U4-10079 - remove default template 2018-01-17 11:36:08 +01:00
Matt Darby
f49d939a2d U4-10825 Search member by email in member section 2018-01-16 23:06:15 +08:00
Shannon
7e1e83b493 Fixes PackageInstaller event args to make sure the package metadata is passed through 2018-01-16 19:18:08 +11:00
Sebastiaan Janssen
23be0134e7 Merge pull request #1605 from jobf/dev-v7 
fix U4-8792 override overflow
 2018-01-13 17:57:49 +01:00
Sebastiaan Janssen
355fb64d8b Merge pull request #1573 from drbldgtl/dev-v7-U4-6415 
Renamed SerializeToCropDataSet to DeserializeToCropDataSet
 2018-01-13 17:33:44 +01:00
Stephan
7f12cff3bd Minor build cleanup 2018-01-11 16:25:18 +01:00
Mads Rasmussen
62d9a1a132 Merge pull request #2379 from umbraco/mzajkowski-U4-4902 
U4-4902 Enable 'discard changes' alert throughout the UI
 2018-01-11 10:59:22 +01:00
Mads Rasmussen
f8c4481eb1 Merge branch 'dev-v7' into mzajkowski-U4-4902 2018-01-11 10:28:28 +01:00
Mike
9f6e6e4701 Add tests to SimilarNodeNameTests to check for null and "" values. 2018-01-10 20:58:10 +00:00
Mike
34ba3f3351 Merge remote-tracking branch 'upstream/dev-v7' into U4-10727 2018-01-10 20:48:28 +00:00
Mike
dcfb8b94d8 Refactor SimilarNodeName to account for null nodeName values. 2018-01-10 20:44:30 +00:00
Ilham Boulghallat
700b71f9fb Merge pull request #2377 from abjerner/patch-32 
A few fixes for the Danish translation
 2018-01-10 15:14:27 +01:00