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

15579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Moon
b962fcdbc3 Minor text changes. 2016-02-13 21:31:13 +00:00
Shannon
e4e7c18460 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-11 18:07:42 +01:00
Shannon
5f246c533c Fixes issue when there are zero instructions in the db table and we've never synced before, in this case it will always cold boot because it will never saved the last synced, in this scenario also the indexes will not build because we've cleared the collection before they can run. 2016-02-11 18:07:31 +01:00
Sebastiaan Janssen
5323543ec0 Merge pull request #1115 from abryukhov/patch-3 
Update UI language ru.xml
 2016-02-11 17:36:28 +01:00
Shannon
d44542694b Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-11 17:31:49 +01:00
Shannon
016a14e5c7 Fixes the image cropper where if you don't have any crops, save an image to a content item, then when you go create a new crop in the data type it wouldn't show up on the front-end or in the back office. 2016-02-11 17:31:37 +01:00
Alexander Bryukhov
52f4dfec80 Update UI language ru.xml 
According new keys added to the 7.4.0 nightly build 164 (models builder keys)
 2016-02-11 22:29:33 +06:00
Sebastiaan Janssen
4f6e023d77 Make sure that everybody working on the source actually gets these assembly references in web.config 2016-02-11 17:11:02 +01:00
Shannon
5e46750cc4 nuspec and version 2016-02-11 16:34:15 +01:00
Shannon
d028b133f5 nuspec updated with MB 2016-02-11 16:27:58 +01:00
Shannon
ca6821104b updated to MB 3.0.0 final 2016-02-11 16:26:21 +01:00
Shannon
1ea8c8280c Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-11 15:54:10 +01:00
Shannon
17ff952b52 Fixes the URL creating for media in the back office to use an IMedia instead of published media (since it's not published yet at the time) 2016-02-11 15:54:00 +01:00
Sebastiaan Janssen
b4f64975a2 Merge pull request #1113 from umbraco/temp-U4-7936 
U4-7936 Clicking the Recycle Bin shows "Session expired" login screen
 2016-02-11 15:48:24 +01:00
Sebastiaan Janssen
1d8a5cf795 Merge pull request #1114 from umbraco/temp-u4-7729 
U4-7729 7.4.0-Beta Cannot drag and Drop PDF on Media Section
 2016-02-11 15:34:41 +01:00
Shannon
dccee93700 fixes up some null checks and fixes up some string null checks - casting XElement to (string) explicitly avoids null reference exceptions when the XElement isn't actually present. 2016-02-11 15:11:11 +01:00
Per Ploug
efeafb4471 U4-7729 7.4.0-Beta Cannot drag and Drop PDF on Media Section 2016-02-11 14:42:47 +01:00
Shannon Deminick
496efde5b3 Merge pull request #1093 from jonrandahl/patch-1 
Update PackagingService.cs
 2016-02-11 14:18:23 +01:00
Shannon Deminick
2b56854652 Merge pull request #1112 from umbraco/temp-U4-7939 
U4-7939 - fix routes cache
 2016-02-11 14:15:13 +01:00
Shannon
04e1d8c2bd U4-7936 Clicking the Recycle Bin shows "Session expired" login screen 2016-02-11 14:04:14 +01:00
Simon Busborg
c7a7dd6ed5 Fixed disabled buttons 2016-02-11 13:12:13 +01:00
Sebastiaan Janssen
1eedbba97a Merge pull request #920 from darrenferguson/dev-v7 
change the text "Reload nodes" to just "Reload" my editors don't know…
 2016-02-11 12:04:45 +01:00
Stephan
d6b46e7e78 U4-7939 - fix routes cache 2016-02-11 11:53:03 +01:00
Shannon
1b03a8f06c Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-11 11:51:11 +01:00
Shannon
726bef1edf adds notes 2016-02-11 11:50:59 +01:00
Sebastiaan Janssen
33aa04bb2f Updates ImageProcessor.Web 2016-02-11 10:35:52 +01:00
Rune Hem Strand
a79333080a Merge pull request #1111 from umbraco/U4-7933 
Fixes issue U4-7933
 2016-02-11 09:49:09 +01:00
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
Niels Hartvig
2c32530701 Too fast, removed the extra amp 2016-02-10 15:47:52 +01:00
Niels Hartvig
d6d945a96e Adds animationprocessmode=false to avoid issues with anim gifs 2016-02-10 15:46:18 +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
Niels Hartvig
8bbeeb2eaf Fixes issue 7933 2016-02-10 15:38:49 +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