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

24903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Warren
afebd88d45 Update ImageProcessorLogger - to use the new Error logger method that contains only an ex - and under the hood it will pass on an empty string to the message 2018-08-23 12:26:33 +01:00
Warren
219e8c730d Add inline null checks as requested 2018-08-23 12:22:05 +01:00
Warren
0c9ac7fa45 Make Log4NetLevel enricher internal - no need for it to be public 2018-08-23 12:16:43 +01:00
Warren
66e4e1f0f4 Adds new method to ILogger for taking only the exception - NOTE will add an empty string for the message 2018-08-23 12:14:07 +01:00
Warren Buckley
5b219af3ad Merge pull request #2874 from umbraco/temp8-93 
fixes: 93 - Content editing: convert overlays into infinite editors
 2018-08-23 10:32:58 +01:00
Mads Rasmussen
ec7610f290 Merge pull request #2865 from umbraco/temp8-w150 
Temp8 w150
 2018-08-23 10:42:35 +02:00
Mads Rasmussen
1a465a7bee move inline styling to a class 2018-08-23 10:31:54 +02:00
Mads Rasmussen
6187018ee7 simplify width calculation to use the browser width instead of the element widths + reuse dropdown component 2018-08-23 10:22:00 +02:00
Shannon
e0610fc85d Gets tinymce syncing with the view model 2018-08-23 18:11:16 +10: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
Shannon
7f734f19f0 Fixes radio button editor 2018-08-23 17:11:57 +10:00
Shannon
c0d617a044 Fixes checkbox list to sync the model value and view model nicely 2018-08-23 16:56:40 +10:00
Shannon
b1ba25debe Fixes contentpicker to update model.value correctly and sync it's renderModel and deal with the quirks of the ui-sortable stuff 2018-08-23 15:31:59 +10:00
Mads Rasmussen
1f4094c676 Revert "move grid layout config to new location" 
This reverts commit 5e0ca12d72.
 2018-08-22 13:55:02 +02:00
Mads Rasmussen
5e0ca12d72 move grid layout config to new location 2018-08-22 13:43:32 +02:00
Mads Rasmussen
c165226688 use infinite media picker in grid media picker 2018-08-22 13:35:35 +02:00
Mads Rasmussen
46dc0baf86 remove unused overlay markup 2018-08-22 12:57:03 +02:00
Mads Rasmussen
973696329d convert memberGroupPicker into an infinite editor 2018-08-22 12:55:27 +02:00
Mads Rasmussen
61312bf61b move member group picker to new location 2018-08-22 12:46:10 +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
Shannon
128c14d06f Fixes datepicker to sync the model value with it's view model correctly 2018-08-22 15:47:12 +10:00
Shannon
320fd82c24 Fixes slider value syncing 2018-08-22 15:00:24 +10:00
Shannon
cc57724834 fixes media picker so that it's model.value stays in sync with it's view model 2018-08-22 14:15:43 +10:00
Shannon
30014ee86b fixes boolean checks and problems with removed angular.lowercase deprecated method 2018-08-22 14:15:23 +10:00
Shannon
5b32268cd7 Merge remote-tracking branch 'origin/temp8' into temp8-141 2018-08-22 14:14:14 +10:00
Shannon
c164a4789b Fixes Slider 2018-08-22 14:13:33 +10: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