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

15547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
d1f513df69 Updates ImageProcessor 2016-02-10 17:09:40 +01:00
Shannon
54ddbc264d Fixes U4-7906 2016-02-10 16:39:05 +01:00
Shannon
89f6089f8e U4-7873 - fix GetCulture issue with languages 2016-02-10 16:22:06 +01:00
Shannon Deminick
cf0b72fd77 Merge pull request #1026 from christofur/U4-7763 
U4-7763 Fix - added mock and references required for 'dev' Grunt task
 2016-02-10 15:54:59 +01:00
Shannon Deminick
4b6aee7fd9 Merge pull request #1109 from abryukhov/patch-3 
Update UI language ru.xml
 2016-02-10 15:44:42 +01:00
Shannon Deminick
5648617809 Merge pull request #1098 from umbraco/temp-U4-7891 
U4-7891 Image Cropper needs a property value converter to return a strongly typed model, json or a string when requested.
 2016-02-10 15:32:55 +01:00
Shannon
0a33b37f2d Fixes issue with U4-7695 and not merging crop values with pre-values properly 2016-02-10 15:31:04 +01:00
Sebastiaan Janssen
157bf0d1eb Include modelsbuilder App_Plugins files in csproj so that the build actually includes them 2016-02-10 14:57:41 +01:00
Shannon
2721c5cb12 adds dynamic caseinsensitive support for the image cropper model 2016-02-10 14:54:00 +01:00
Shannon
fd984bd613 Ensures media.Url works properly 2016-02-10 14:53:58 +01:00
Shannon
fe0ed2ceea Adds some notes and ensures that the ImageCropperValueConverter shadows the correct one. 2016-02-10 14:53:57 +01:00
Shannon
0829bae5b2 Fixes TextStringValueConverter to include the text box and multi-textbox (since it's like that in the Core one that this overrides), adds new converter for Image cropper including ToString converter & custom type converter to convert from the strongly typed object to JObject, adds test to support this, adds equatable methods for the strongly typed model so it can be easily compared. Ensures that the webboot manager does not include the core value converter for image cropper. 2016-02-10 14:53:56 +01:00
Stephan
c3c1567c2e Merge pull request #1100 from umbraco/temp-U4-7881 
U4-7881 - fix errors with compositions
 2016-02-10 14:53:45 +01:00
Shannon
4a8b59bdfa putting back in ContentTypeId on PropertyTypeDisplay, turns out this IS used when we remove a composition, we need to know which properties are related to which type. have also fixed another potential bug regarding compositions + generic properties, before we were not setting the ContentTypeId correct for a composition property type on the generic properties tab. 2016-02-10 14:34:33 +01:00
Shannon
af543c56ec moves model to correct namespace 2016-02-10 13:31:36 +01:00
Claus
4113def0b6 Fixes: U4-7881 version 7.4 beta - cannot add composition doctype to a doctype that has already been saved 2016-02-10 13:08:36 +01:00
Shannon Deminick
c346e62176 Merge pull request #1108 from umbraco/temp-U4-7799 
Fixes: U4-7799 ModelsBuilder button in Content Type Editor should sav…
 2016-02-10 13:05:38 +01:00
Sebastiaan Janssen
94fdbb1983 U4-7669 Update Newtonsoft.Json dependency to v8.0.1 from v6.0.5 2016-02-10 13:04:50 +01:00
Shannon
f32e688c1a Fixes the MB re-generate button - this will only be shown when the models are out of date. 2016-02-10 13:04:04 +01:00
Mads Rasmussen
0303196f42 show Ulog error message when models builder fails 2016-02-10 11:47:01 +01:00
Mads Rasmussen
c8faf17017 Fixes: U4-7799 ModelsBuilder button in Content Type Editor should save the current content type 2016-02-10 11:47:00 +01:00
Sebastiaan Janssen
b2cba310b9 U4-7720 Media grid doesn't display preview for animated gif 
In preparation of an updated ImageProcessor build, everything that displays animated gifs in the backoffice can run into this issue, so we show the first frame only everywhere (better than just a broken image)
 2016-02-10 11:39:00 +01:00
Sebastiaan Janssen
95522afda8 Merge pull request #1110 from umbraco/temp-U4-7925 
U4-7925 Add dependency injection to Umbraco.Web.Trees.TreeController*
 2016-02-10 10:57:15 +01:00
Shannon
1b84e33392 reinstall the RC2 version 2016-02-10 10:43:41 +01:00
Shannon
065ed5ed78 updates nuspec 2016-02-10 10:28:57 +01:00
Shannon
9e931b84db U4-7925 Add dependency injection to Umbraco.Web.Trees.TreeController* 2016-02-10 10:26:09 +01:00
Shannon
be449a96f7 updates to MB rc2 2016-02-10 10:26:08 +01:00
Alexander Bryukhov
a22bfb927a Update UI language ru.xml 
According new keys added to the 7.4.0 nightly build 162
 2016-02-09 22:18:11 +06:00
Sebastiaan Janssen
5b92b30f64 Don't include the uninstall file in nuspec, it's missing so the package won't build 2016-02-09 17:16:04 +01:00
Sebastiaan Janssen
5e8200ecb2 U4-7909 7.4-rc1 is missing references because it's using portable class libraries now 
#U4-7909 Fixed
 2016-02-09 17:10:43 +01:00
Sebastiaan Janssen
9b5ea3da21 Can't have an uninstall as it runs during Update-Package, removing configuration settings like umbracoConfigurationStatus triggering the fresh install screen all user settings are also reverted :/ 2016-02-09 17:10:14 +01:00
Sebastiaan Janssen
d495b96434 U4-7924 NuGet web.config transform changes targetFramework 2016-02-09 16:29:20 +01:00
Sebastiaan Janssen
79edf81434 Just whitespace, formatting document 2016-02-09 16:00:02 +01:00
Sebastiaan Janssen
b3620f1ca4 U4-7924 NuGet web.config transform removes <codedom> 
#U4-7924 Fixed
 2016-02-09 15:39:48 +01:00
Stephan
b6a9734755 Fix ModelsBuilder integration 2016-02-09 11:46:26 +01:00
Shannon
c4cedaddd2 Merge remote-tracking branch 'origin/master-v7' into dev-v7 2016-02-09 11:00:57 +01:00
Shannon
b5a2b3dbbd U4-7922 Preview is not working 2016-02-09 10:56:15 +01:00
Mads Rasmussen
dc4266852f Fixes: U4-7915 7.4 RC1: Cannot change grid background 2016-02-09 09:57:41 +01:00
Simon Busborg
881e8daafd Merge pull request #1104 from abryukhov/patch-3 
Update UI language ru.xml
 2016-02-08 18:51:20 +01:00
Claus
54c1d25296 Fixes: U4-6407 Change Document Type feature on a node doesn't support compositions 2016-02-08 14:39:16 +01:00
Mads Rasmussen
624d3a9b82 fixes: U4-7905 val-highlight directive not highlighting error fields (red border) in 7.4.0 2016-02-08 13:35:59 +01:00
Mads Rasmussen
d46d23b372 Fixes: U4-7732 Grid changes do not trigger Unsaved Changes notification 2016-02-08 12:07:45 +01:00
Mads Rasmussen
aeba68782c fixes: U4-7903 Using shortcut for "add property" removes "add property"-field for other tabs in document type editor && U4-7904 Add property using shortcut - submit button text is missing 2016-02-08 10:54:58 +01:00
Mads Rasmussen
ac60c63104 Fixes: U4-7900 The new content type editor: If you hit save while it generates an alias, the alias will be generatingAlias 2016-02-08 10:20:09 +01:00
Claus
6e0e48b6e4 Merge pull request #1103 from arknu/U4-7819 
U4-7819: Use correct messages when saving Media and Member types
 2016-02-08 09:24:42 +01:00
Alexander Bryukhov
0ea15ae22e Update UI language ru.xml 
According new / changed keys of 7.4 nightly build 161
 2016-02-07 11:37:06 +06:00
Asbjørn Riis-Knudsen
54548ffc68 U4-7819: Use correct messages when saving Media and Member types 2016-02-06 17:34:36 +01:00
Claus
fdc50f0635 Merge pull request #1101 from KevinJump/dev-v7-GetContent/MediaContainer-Fix 
Fix GetContentTypeContainer and GetMediaTypeContainer
 2016-02-05 15:15:56 +01:00
Kevin Jump
11743ea322 Fix GetContentTypeContainer and GetMediaTypeContainer to use correct guid 
updated to use DocumentTypeContainerGuid,  MediaTypeContainerGuid
contstants in calls.
 2016-02-05 13:20:10 +00:00
Simon Busborg
4d74ec7785 Makes editor types tabs accessible. 2016-02-05 11:49:41 +01:00