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

24919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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