yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,480 Commits 4 Branches 7 Tags
8666b222acb23bec455693a9f112c4e3b0a52cfd
Commit Graph

22480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Mads Rasmussen
ef6822e15b Merge pull request #2873 from kjac/media-picker-update 
Media picker: Minor style update + add help text.
 2018-08-23 09:29:05 +02:00
Jan Skovgaard
015e89b927 Make sure the "open" action is only visible when logged in as an administrator 2018-08-22 11:31:07 +02:00
Jan Skovgaard
05e48376c7 Use the node object to get the name and icon so it's also displayed for non-admin users 2018-08-22 11:30:39 +02:00
Jan Skovgaard
a2cc0ec411 Shorten comments 2018-08-22 11:30:07 +02:00
Jan Skovgaard
d4fff97814 Move the setModePublishStatus function above the scope.previewOpenUrl...not sure why but this makes the status be visible when logged in as something other than an administrator. When logged in as an admin it worked fine before. Can't quite make sense of this. But now it works. 2018-08-22 11:23:51 +02:00
Lee Kelleher
06e99c3b33 Corrected the title of the "Edit" button 
umb-node-preview directive - corrected the title of the "Edit" button
 2018-08-22 09:13:43 +01:00
Jan Skovgaard
ad3d27be76 Reference the node object instead of the documentType object, which returns null if the user is not logged in as an admin. 2018-08-22 10:00:54 +02:00
Jan Skovgaard
2e2fc6ad84 Make sure to check whether the open anchor for the template should be displayed or not 2018-08-22 09:31:44 +02:00
Jan Skovgaard
9f396e4b15 By default set the "allowOpen" to be false and only set it to true if the current user is an admin. This ensures that the "Open" anchors are never displayed for other than admin users. 2018-08-22 09:13:46 +02:00
Barry Bell
f42862c42a Update ImageCropDataSet.cs 
If only one of the Left or Right values changed the HasFocalPoint function would return false but this should now return true if only one is altered
 2018-08-21 21:07:54 +01:00
Mads Rasmussen
f7201a70bd add colored border 2018-08-21 21:20:38 +02:00
Mads Rasmussen
ec67ab83af Merge branch 'patch-1' of git://github.com/jannikanker/Umbraco-CMS into jannikanker-patch-1 2018-08-21 21:10:01 +02:00
Rasmus John Pedersen
a725ddae5a Only remove ? or # if it's part of the url 2018-08-21 17:10:46 +02:00
Jan Skovgaard
8f2c253138 Refactort the scope.nodeUrl to be updated whenever save is hit in the existing update watcher 2018-08-21 14:52:00 +02:00
Sebastiaan Janssen
e6597d47e3 Fixes U4-11574 - return an empty string if the datatype is in "single" mode and nothing is selected 2018-08-20 16:12:23 +02:00
Nathan Woulfe
89f69bd2a8 U4 4732 - fix regressions in 7.12 (#2862) 2018-08-20 16:10:36 +02:00
Sebastiaan Janssen
8087fc4c9a Merge pull request #2858 from umbraco/temp-U4-11579 
U4-11579 Take startNodeId into account before picking the current nod…
 2018-08-20 12:06:45 +02:00
Radu Orleanu
f665f8af89 fixing U4-11570 (#2860) 2018-08-17 14:04:35 +02:00
Kenn Jacobsen
de8a24c691 Add "info" style to upload button + add help text when the dropzone is hidden. 2018-08-17 12:22:54 +02:00
Sebastiaan Janssen
c4163e94c0 Merge pull request #2856 from dawoe/remove-deleted-scripts-from-solution 
Removed files from solution that are not longer present in repo
 2018-08-17 08:25:50 +02:00
Sebastiaan Janssen
62855d021f Merge pull request #2857 from umbraco/temp-U4-11581 
U4-11581 In rare cases the umbracoLanguage table has a constraint ins…
 2018-08-17 08:24:43 +02:00
Shannon
49430ca0a5 fixes logic order of dropping indexes 2018-08-17 16:07:53 +10:00