yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,939 Commits 4 Branches 7 Tags
5009dfa0d7a6d79cd9f03e33f67535f54b5e65d1
Commit Graph

24939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
5e7c9f2341 Merge pull request #2876 from RNHornets/temp-u4-9030 
U4-9030 Moving a RTE between grid cells causes rendering issues for other RTEs
 2018-08-26 22:57:17 +02:00
Sebastiaan Janssen
bec8aabede Merge pull request #2442 from madsoulswe/temp-U4-10962 
U4-10962 - Disable stickyheader when nested, fix margins when disabled
 2018-08-26 22:17:44 +02:00
Sebastiaan Janssen
c07780caff Merge pull request #2481 from SaDa1337/dev-v7.9 
fix x alignment in colorpicker transparent option in umbraco skin
 2018-08-26 22:08:24 +02:00
Sebastiaan Janssen
0c3d3ca545 Merge pull request #2506 from PeteDuncanson/temp-U4-11074 
Added web.config to fonts folder to allow for caching out of the box
 2018-08-26 21:26:45 +02:00
Sebastiaan Janssen
35a0d4451f Merge pull request #2483 from kccsf/U4-4441 
U4-4441 Fix: TinyMCE overlay was showing in front of login overlay
 2018-08-26 21:01:58 +02:00
Sebastiaan Janssen
03fdba6a3b Merge pull request #2512 from NathalieLarsson/dev-v7 
Quick fix for U4-11085 and added filtering to list view in MNTP
 2018-08-26 20:51:53 +02:00
Sebastiaan Janssen
550c383598 Also make sure there's a value for dialogOptions.filterTypes if it doesn't start with "!" 
Else you get errors on `dialogOptions.filterTypes.toLowerCase()`
 2018-08-26 20:47:26 +02:00
Sebastiaan Janssen
9d3d718e16 Merge branch 'dev-v7' into dev-v7 2018-08-26 20:33:00 +02:00
Ben Palmer
b09bf518c6 U4-9237 Validate application parameter when getting application trees (#2315) 2018-08-26 18:12:07 +02:00
Sebastiaan Janssen
8666b222ac Merge pull request #2841 from leekelleher/U4-11556 
U4-11556 - Removed metablogConfig.config
 2018-08-26 18:04:50 +02:00
Sebastiaan Janssen
9e564d70ef Merge branch 'drpeck-U4-8550' into dev-v7 2018-08-26 17:57:00 +02:00
Sebastiaan Janssen
276810be6c Bump to v7.13.0 2018-08-26 17:56:13 +02:00
Sebastiaan Janssen
49df6e7c9d Merge branch 'U4-8550' of https://github.com/drpeck/Umbraco-CMS into drpeck-U4-8550 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/PublishedContentExtensions.cs
 2018-08-26 17:45:34 +02:00
Sebastiaan Janssen
16155ea416 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-08-26 17:25:18 +02:00
Sebastiaan Janssen
f183e27cae Merge branch 'jamescoxhead-U4-11166' into dev-v7 2018-08-26 17:24:18 +02:00
Sebastiaan Janssen
a411c9c300 Make sure inactive users get the correct state attached to them 2018-08-26 17:23:52 +02:00
Sebastiaan Janssen
342ac7b1b2 Merge branch 'U4-11166' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-11166 2018-08-26 16:52:58 +02:00
Sebastiaan Janssen
f5ac5f20a8 Merge pull request #2869 from Bazmech/temp-U4-11594 
U4-11594 HasFocalPoint in ImageCropDataSet does not return correct value
 2018-08-26 16:44:19 +02:00
Chris Houston
56de9ff4ae Fix for issue: U4 11409 - "Create content" tour is failing when doing the tour with the starter kit installed (#2851) 2018-08-26 14:52:14 +02:00
Mads Rasmussen
7fce9799e7 clear editorService and overlayService when a new user logs in 2018-08-24 21:06:48 +02:00
Mads Rasmussen
d8006b54e8 soften overlay shadow 2018-08-24 21:05:36 +02:00
Robert
e3ee485126 Merge pull request #2875 from umbraco/temp8-141 
Editing all variants at once - Deal with invariant property value syncing
 2018-08-24 14:43:46 +02:00
Robert
3b4aa66516 Merge branch 'temp8' into temp8-141 2018-08-24 14:43:15 +02:00
Mads Rasmussen
32d263a398 translate labels 2018-08-24 14:08:36 +02:00
Mads Rasmussen
3f05396c2b show discard changes dialog when changing location and infinite editors are open + reuse same overlay for unsaved changes 2018-08-24 13:51:07 +02:00
Robert
09719d0ca3 Fixes slider 2018-08-24 12:50:46 +02:00
Arbie Sarkissian
e4d8fcf019 U4-11506 - Fix Gregorian DateTime.MinValue is out of range for some calendars (like PersianCalendar) (#2821) 2018-08-24 11:15:53 +02:00
Sebastiaan Janssen
e1f7e835ea Fixes U4-11584 RelatedLinks2 throws exception with null value in Link field 2018-08-24 11:08:27 +02:00
Sebastiaan Janssen
d83bb6aa49 Whoops, committed the wrong file! Revert "Fixes U4-11584 RelatedLinks2 throws exception with null value in Link field" 
This reverts commit 612138f0e1.
 2018-08-24 11:07:55 +02:00
Robert Johnston
06e55c8c4e Use offsetParent to get the grid cell for the moved item since parents() always returns 0 results 2018-08-24 09:50:24 +01:00
Sebastiaan Janssen
612138f0e1 Fixes U4-11584 RelatedLinks2 throws exception with null value in Link field 2018-08-24 10:49:39 +02:00
Sebastiaan Janssen
bfc627857d Merge pull request #2840 from WebCentrum/temp-U4-11527 
U4-11527 Fix concurrency issue
 2018-08-24 00:02:30 +02:00
BatJan
7d439566cd U4-11526 - Member Group Picker doesn't remove group after unselecting it during selection. (#2835) 2018-08-23 23:56:32 +02:00
Sebastiaan Janssen
d224a93ce1 Merge branch 'BatJan-feature/temp-U4-11577' into dev-v7 2018-08-23 23:44:23 +02:00
Sebastiaan Janssen
3454db6ee8 No need to do an extra userService request, if the contentType is null we can't access the settings section, that's a good enough test 
Also fixed the bug where editors would see the node name instead of the content type name
 2018-08-23 23:36:50 +02:00
Sebastiaan Janssen
b67c06a85a Remove console.log that was left behind 2018-08-23 22:23:41 +02:00
Sebastiaan Janssen
44bd3dec9a Merge branch 'dev-v7' into feature/temp-U4-11577 2018-08-23 22:22:57 +02:00
Thomas Nielsen
68ac84aa1d Sort the Umbraco.UserPicker list alphabetically by name (#2872) 2018-08-23 22:15:28 +02:00
Sebastiaan Janssen
c1bf8259ef Merge branch 'rasmusjp-fix/linkpicker-url-empty' into dev-v7 2018-08-23 21:34:06 +02:00
Sebastiaan Janssen
1b1df84863 Populates the anchor when found 
Also fixes one of the JS files where .model was seemingly used randomly, but the view doesn't want a .model in there
 2018-08-23 21:31:31 +02:00
Sebastiaan Janssen
05fdfc6b34 Merge branch 'fix/linkpicker-url-empty' of https://github.com/rasmusjp/Umbraco-CMS into rasmusjp-fix/linkpicker-url-empty 2018-08-23 20:52:14 +02:00
Sebastiaan Janssen
18b690f11a Bump the version to 7.12.2 2018-08-23 20:45:49 +02:00
Sebastiaan Janssen
d3b577fe37 Merge pull request #2867 from BatJan/features/temp-U4-11587 
U4-11587 Media link does not update when the file is swapped
 2018-08-23 20:37:45 +02:00
Sebastiaan Janssen
720409ef54 Merge pull request #2871 from leekelleher/U4-11595 
umb-node-preview directive - corrected the title of the "Edit" button
 2018-08-23 19:21:30 +02:00
Sebastiaan Janssen
919a63d0ea Merge pull request #2848 from readingdancer/U4-11569 
Small tweaks to the Getting Started tour text.
 2018-08-23 18:53:40 +02:00
Warren
24f91f1917 Adds in Error without ex for just a message and a message template with params 2018-08-23 14:43:38 +01:00
Warren
fb4b0ceb69 Verified the log works correctly from my TODO note 2018-08-23 13:23:40 +01:00
Warren
e17ba1c876 Verified the log output for genRef is all ok & remove TODO note 2018-08-23 13:09:51 +01:00
Warren
224a7de61f Update ignore list for typefinder tests to include Serilog. in exclusion filters 2018-08-23 12:56:35 +01:00
Warren
4070fc65b7 Remove some //WB TODOs to check if the enum returns the string and not 0,1 etc- check & verified all good :) 2018-08-23 12:49:27 +01:00