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

12966 Commits

Author SHA1 Message Date
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
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
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
Shannon
1b84e33392 reinstall the RC2 version 2016-02-10 10:43:41 +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
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
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
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
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
Mads Rasmussen
08844ea098 close user dialog when clicking on edit, history links and logout 2016-02-05 11:08:34 +01:00
Claus
3449b1efd3 Toggle password fields after successfully changing the password. 2016-02-05 10:43:37 +01:00
Claus
00d012162f Added a bunch of missing translations in user overlay. 2016-02-05 10:38:15 +01:00
Shannon
25482f53ef updates to MB RC1 2016-02-04 20:23:11 +01:00
Mads Rasmussen
82699a8ac9 Fixes: U4-7898 Validation for locked alias still not working 2016-02-04 20:08:19 +01:00
Shannon
0ea68f4f42 added logic for media and member type angular callbacks that existed for content types - assuming this is important and should be there for all content types. Added alias information to validation message returned from server. 2016-02-04 19:40:29 +01:00
Shannon
2cd4e9aa99 makes media types the same as the other content types 2016-02-04 19:26:16 +01:00
Shannon
8e3454d24f Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-04 19:17:00 +01:00
Shannon
e352c65420 fixes server side validation issue for content types 2016-02-04 19:16:45 +01:00
Sebastiaan Janssen
16caeb96bd Another build warning that can be removed 2016-02-04 18:36:26 +01:00
Sebastiaan Janssen
fbd5bdbd1d Surely nobody on their dev machines has the "trust" node in their web.configs any more, no more need to transform that one (gave warning during build.bat) 2016-02-04 18:35:16 +01:00
Shannon
9978b0d8ea Merge branch 'dev-v7' into temp-U4-3447 2016-02-04 18:30:58 +01:00
Shannon
0d9fef5457 changes to use StripWhitespace to fix tests 2016-02-04 18:09:17 +01:00
Shannon Deminick
7449e3bf1d Merge pull request #1096 from umbraco/temp-U4-7895 
U4-7895 - routing fails when path contains dots
 2016-02-04 17:44:39 +01:00
Shannon Deminick
e6550b543d Merge pull request #1099 from robertjf/dev-v7 
U4-7897 Minor update to MembershipProviderBase.DecryptPassword() to remove code smell
 2016-02-04 17:38:59 +01:00