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

295 Commits

Author SHA1 Message Date
Shannon Deminick
df9a887032 Merge with 4.11.7 2013-04-23 20:50:30 -10:00
agrath
3594693f4b Backported fix for u4-335 from Commit b15d0ab0b879 into 4.11.7 2013-04-22 11:12:03 -12:00
Shannon Deminick
d6d630cb2c Merge with 6.0.4 2013-04-19 04:40:49 +06:00
Shannon Deminick
35a698cdc9 Merge with 4.11.7 2013-04-19 04:40:13 +06:00
Shannon Deminick
c0fd974cc1 fixes typo on word disallow 2013-04-19 04:20:24 +06:00
Shannon Deminick
979fe46e9b Updated CDF to 1.6.0.0 2013-04-18 00:55:40 +06:00
Shannon Deminick
22fb7e1706 Merge 2013-04-12 03:07:53 +06:00
Shannon Deminick
12b1168de9 Fixes merge issues 2013-04-12 02:59:03 +06:00
Shannon Deminick
01290f8174 Merge with 4.11.7 2013-04-12 02:14:59 +06:00
Shannon Deminick
26a7bf8187 Fixes: #U4-2087 2013-04-12 02:11:01 +06:00
Sebastiaan Janssen
ba1d0fa193 Improve code for previous fix so we don't need the try/catch any more. 2013-04-11 16:36:26 -02:00
Sebastiaan Janssen
97355bde6f Fixes U4-2091 Inserting image in RTE with mediatype "File" causes YSOD 2013-04-11 13:15:08 -02:00
Shannon Deminick
4ef9dbb9b4 Merge 2013-04-12 03:07:30 +06:00
Shannon Deminick
f716ba380c Merge with 6.0.4 2013-04-12 03:02:40 +06:00
Sebastiaan Janssen
439445aae4 Merge with 6.0.4 2013-04-11 16:39:28 -02:00
Shannon Deminick
0d79eaf3c5 Merge with 6.0.4 2013-04-12 00:32:19 +06:00
Shannon Deminick
132ec1702c Merge with 6.0.3 2013-03-26 22:09:50 +06:00
Sebastiaan Janssen
d4ab60f8af Merge with 4.11.6 2013-03-26 13:29:45 -01:00
Sebastiaan Janssen
883277125a Can't use parameters here as the query gets butchered. 2013-03-26 13:27:46 -01:00
Sebastiaan Janssen
2fd299ebfc Change TinyMCE to use the mediaservice to get the original image + some updates 
to the new mediaservice method.
 2013-03-26 07:15:22 -01:00
Sebastiaan Janssen
b745c0ae90 If the image is not resized, there's probably not going to be an underscore, 
just query for the whole image source then.
 2013-03-25 18:18:14 -01:00
Sebastiaan Janssen
f2efff5411 Temporary fix until we can fix this properly for U4-1812 - Changing Width or 
Height in Insert Picture popup results in NaN in other dimension
 2013-03-25 18:09:31 -01:00
Shannon Deminick
390f56a64d Merge with 6.0.3 2013-03-25 20:54:49 +06:00
Sebastiaan Janssen
dffce76e29 Merge with 4.11.6 2013-03-25 10:24:36 -01:00
leekelleher
b6ec364156 Updated references to the new constants for Application and MediaType aliases. 2013-03-22 13:13:05 +00:00
leekelleher
3af7958940 Updated references for alias conventions constants across the solution. 2013-03-18 17:55:02 +00:00
Sebastiaan Janssen
5914690ad8 Allow leading sign in number field so that negative numbers are supported 2013-03-25 10:09:02 -01:00
Morten Christensen
c4aa9095f2 Fixes U4-1858 by ensuring that the text field is reset before setting or removing a value 2013-03-13 20:24:21 -01:00
Morten Christensen
79ce586c8b Fixes U4-1808 by removing the database lookup from an id that was resolved from the media url 2013-03-13 19:26:22 -01:00
Hendy
84171c6b98 Added Media and Member support to XPath CheckBoxList 2013-03-01 22:53:14 +00:00
Hendy
5effe5015e Added Media and Member support to XPath DropDownList 2013-03-01 15:28:03 +00:00
Sebastiaan Janssen
b017e8690a Fix errors in log caused by no prevalues beind selected. 2013-02-28 09:53:57 -01:00
Sebastiaan Janssen
916e442ee4 Fix errors in log caused by no prevalues beind selected. 2013-02-28 09:53:57 -01:00
Shannon Deminick
ea7fb32fb9 Merge with 6.0.3 2013-03-15 06:23:54 +04:00
leekelleher
2cd64dd540 Missed a few TinyMCE GUID references, (due to their string format). 2013-03-14 22:15:39 +00:00
leekelleher
37860b4015 Replaced all hard-coded GUID references to use the new Constants. 2013-03-14 22:00:37 +00:00
leekelleher
0f056b1702 Updated GUID references in editorControls and uQuery to use the new Constants. 2013-03-14 21:58:31 +00:00
Morten Christensen
fef96e8b43 Fixes issue related to moving PropertyTypes between tabs. 
Ensures that the right tabs with the right ids are loaded in the dropdown.
 2013-02-26 13:31:29 -01:00
Shannon Deminick
e2d806f5d9 Merge with 4.11.5 2013-02-22 20:00:10 +06:00
Sebastiaan Janssen
4648a8c103 Fixes U4-1746 Duplicate image source (src) when inserting resized image in tiny 
mce (richtext editor)
 2013-02-22 11:41:01 -01:00
Sebastiaan Janssen
2df05da7fc Fixes U4-1746 Duplicate image source (src) when inserting resized image in tiny 
mce (richtext editor)
 2013-02-22 11:41:01 -01:00
Sebastiaan Janssen
87fee572ff Enable nuget package restore for teamcity, upgrade examine dll 2013-02-22 09:47:23 -01:00
Sebastiaan Janssen
51ff861e44 Merge with 6.0.0 2013-01-31 14:09:24 -01:00
Morten Christensen
29ef529c57 Fixes U4-1592 so its possible to clear values when saving 2013-01-30 08:42:26 -01:00
Shannon Deminick
c9d55a4a5e Merge with 6.0.0 - Ensures 6.1 is in sync with 6.0 too 2013-01-29 10:15:49 +06:00
Shannon Deminick
66bf667100 Merge with 4.11.4 2013-01-29 09:58:47 +06:00
leekelleher
9f5f920c81 MNTP: Corrected a typo in the example XPath (additional apostrophe) 2013-01-28 17:18:20 +00:00
leekelleher
93bdfc8915 Fixed U4-1562 YSOD saving a Slider property editor set to DB type Nvarchar. 
If the Int DbType isn't selected, the DataType will save as string/Nvarchar.
 2013-01-28 17:13:18 +00:00
Sebastiaan Janssen
1304a9d791 Fixed U4-1495 Include Umbraco assemblies' XML files to make use of comments 2013-01-18 08:44:39 -01:00
NielsHartvig@UMBRACORATI.localdomain
cbebe0141f Fixed U4-1439 4.11.2 DataEditorSetting not working for UserControl wrapper. 2013-01-15 13:18:37 -01:00