yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,837 Commits 4 Branches 7 Tags
414dbe45a69cc4def3daaa916be03e658f88767b
Commit Graph

196 Commits

Author SHA1 Message Date
Sebastiaan Janssen
5d37eaf993 #U4-4673 Fixed Due in version: 7.1.6 2014-08-25 14:32:35 +02:00
Shannon
d07ba12e73 Fixes merge 2014-07-24 14:50:06 -07:00
Shannon
7d7fa0e389 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-07-24 09:42:44 -07:00
Shannon
ff94eba3a7 Fixes: U4-5273 6.2: Umbraco.Field no longer rendering macro container 2014-07-24 09:39:05 -07:00
Sebastiaan Janssen
ea56363f6d Adds logging to the RteEmbedController when there's an exception, instead of silently swallowing the error 2014-07-23 14:04:50 +02:00
Sebastiaan Janssen
5bee398d09 #U4-3838 fixed Due in version 7.1.5 
Fixes ContentService Copy uses IOHelper.MapPath but should use fs.GetFullPath and a few other instances where IOHelper was used
 2014-06-27 17:22:51 +02:00
Jan Skovgaard
18fc6ccc99 Fix of U4-4382 2014-06-09 13:23:01 +02:00
Sebastiaan Janssen
92ef071883 Don't do a ToString() in a IsNullOrEmpty.. 2014-05-28 16:37:16 +02:00
Shannon
f5194efb6e Fixes: U4-4999 Image cropper - Image file duplicated each time the page (content) is saved/published 2014-05-28 12:29:41 +10:00
Shannon
1c7d83f589 Undoes the comma encoding for tags and istead adds support to store the tags as json or csv (U4-4741) 2014-05-15 12:49:03 +10:00
Shannon
a846ba64eb Fixes: U4-4799 Ensure image logic found in the ContentService is duplicated for the new cropper 2014-05-06 15:27:53 +10:00
Shannon
d2a20b10aa nearly got tag typeahead working 2014-05-05 19:07:57 +10:00
BatJan
c2c5098045 Fix of spelling mistake in "minumum". 
Corrected "minumum" to "minimum" according to http://issues.umbraco.org/issue/U4-4804
 2014-05-01 16:35:22 +02:00
Shannon
ad95736eaa Fixes issues relating to adding ability to sort pre-values, had to update all property editors that use the shared sortable pre-values, ensure the list items are an array and then sorted. 2014-03-26 13:01:53 +11:00
Shannon
be8320bb4b fixes some compatibility issues with PR for sortable pre-vals 2014-03-25 14:14:09 +11:00
Shannon
1d4b6178e5 Merge branch 'wip-u4-3951' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-3951 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
 2014-03-25 13:31:21 +11:00
Shannon
79584a9cf9 Fixes thread safety issue with RichTextPreValueController 2014-03-24 16:32:42 +11:00
perploug
ab70c98d4c Ensures the config is cleared properly every time 2014-03-20 09:41:30 -07:00
Shannon
39e7947435 fixes merge issues 2014-03-20 13:15:53 +11:00
Shannon
2792937b17 Merge branch '7.1_U4-4447' of https://github.com/arknu/Umbraco-CMS into arknu-7.1_U4-4447 
Conflicts:
	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
 2014-03-20 13:10:39 +11:00
Shannon
af9a9a9a7a Fixes: U4-4481 Image cropper pre value editor doesn't validate properly 2014-03-20 13:03:30 +11:00
arknu
c565744a9b Fix drag-and-drop upload 2014-03-19 17:46:04 +01:00
perploug
375b3948e0 Fixes: U4-4177 U7 - Add Startnode Picker to Multiple Media Picker 2014-03-18 23:49:05 -07:00
Shannon
71201970e9 Gets the new color spectrum pre-value editor working. 2014-03-19 17:45:21 +11:00
Shannon
992727821b Merge branch 'robertjf-7.0.2' into 7.1.0 2014-03-19 15:43:46 +11:00
Shannon
f70717985c Cleans up a little bit of code and adds some null checks. 2014-03-19 15:32:31 +11:00
arknu
1948fe12b3 U4-4447: Make image properties populate when uploading from ImageCropper 2014-03-18 22:31:05 +01:00
perploug
9e97b84fb8 Fixes issues with crop sizes prevalues 2014-03-17 19:40:52 +01:00
Robert Foster
58bfb6999d Merge remote-tracking branch 'upstream/7.0.2' into 7.0.2 2014-03-14 13:45:40 +11:00
perploug
c3471ffbc3 Cropsizes config and upload compatible 
Refactors imagecropper and fileupload to use the samen metadata setting
extensions
 2014-02-20 12:59:15 +01:00
perploug
f8baf343bf Fixing totally broken merge 2014-02-20 12:59:11 +01:00
perploug
84e7396729 Ensure that umbracoFile doesnt try to process json as a filepath 2014-02-19 00:19:17 +01:00
perploug
81305173ca Changes imagecropper to store config in its property data 2014-02-19 00:19:15 +01:00
perploug
ec14a16aec ImageCropper Razor models + helpers 2014-02-17 16:17:17 +01:00
perploug
2bd2f12831 ImageCropper Upload enabled 
The cropper can now fully replace the upload datatype
 2014-02-17 16:17:02 +01:00
perploug
fa4e9d0cd1 Merge remote-tracking branch 'origin/7.1.0-ImageCropper-WIP' into 7.1.0 2014-02-11 14:56:41 +01:00
perploug
7dbd21a854 ImageCropper Added as a real property editor + polish 
Polishing the UI, it can now edit actual image data and store crop
points / center point as json, next add configuration service
 2014-02-07 09:15:44 +01:00
Stephan
56cd1cee81 U4-4160 - make sure string properties are returned as strings 2014-01-30 15:08:13 +01:00
Shannon
9f078357a7 Fixes: U4-4030 RelatedLinksEditorValueConvertor can't be overruled and internal links are wrong 2014-01-15 15:17:03 +11:00
Shannon
bb837232ba Allows DefaultPropertyValueConverters to shadow other default converters, this allows us to have a hierarchy of default converters. This also fixes part of this issue: U4-4030 RelatedLinksEditorValueConvertor can't be overruled and internal links are wrong 2014-01-15 14:45:33 +11:00
Robert Foster
f674fdf014 Implemented spectrum for picking colors for the color picker pre-value editor and added broader bgColor directive 2014-01-13 03:26:55 +11:00
Shannon
85bf47df82 Fixes FileUploadPropertyEditor and IFileSystem usage 2013-12-11 09:05:38 +11:00
Shannon
76c807a4e7 Fixes latest IFileSystem fix for image uploading 2013-12-10 16:48:57 +11:00
Shannon
d0a5892f9f Fixes: U4-3796 No media macro parameter in v7 2013-12-10 14:13:56 +11:00
Shannon
366ca11490 Merge branch 'lars-erik-7.0.azurestorage' into 7.0.1 2013-12-05 18:45:21 +11:00
Lars-Erik Aabech
6458c223b8 Cleaned it up a bit. Now just using media file system provider. 
It needs a bit of convesion rules though, need getfullpath(getrelativepath(path)) to be compatible with package & physical.
 2013-12-04 19:47:54 +01:00
Lars-Erik Aabech
a511c84b4d Messy fix to support images on other domain. (Read: Azure Storage) 
Added GetResized to replace usage of third party packages for simple resizing.

This PR should probably not be pulled, but I make a PR to show you what must be done.
Surely this is considered for UAAS?
 2013-12-04 16:12:27 +01:00
Shannon
176ec0edc0 Fixes: U4-3651 What is the "Pick multiple items" prevalue on MNTP for? and removes the remaining uGoLive references. 2013-12-04 17:13:26 +11:00
Shannon
13b6318ad2 Fixes: U4-3776 v7 - MNTP value type changes between int and string 2013-12-04 15:57:55 +11:00
Shannon
50e10155e7 Completes: U4-3712 Allow c# property editors to have custom js injected into the js initialization block so they can load in angular controllers 2013-11-28 14:27:58 +11:00