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 |
|
Sebastiaan Janssen
|
ed35f234de
|
Fixes U4-2100 Media Doesn't Overwrite in 6.0.3
|
2013-04-11 12:27:11 -02:00 |
|
Sebastiaan Janssen
|
c874fa6507
|
Fixes U4-2097 Package import causes template tree to break
|
2013-04-11 10:20:17 -02:00 |
|
Sebastiaan Janssen
|
ba387598ed
|
Merge with 4.11.7
|
2013-04-11 07:17:23 -02:00 |
|
Sebastiaan Janssen
|
3ff1b01e46
|
Add DotSettings file for custom code inspections. In this case: Replace
!someBool with an explicit false check (someBool == false) for readability.
|
2013-04-11 07:15:06 -02:00 |
|
Shannon Deminick
|
36e803713c
|
Fixed up some code in UmbracoEnsuredPage and moveOrCopy
|
2013-04-11 02:15:48 +06:00 |
|
Shannon Deminick
|
a3e7f644de
|
merges changes for UmbracoHelper from 6.0.x to deal with null objects when using Content method (dynamic)
|
2013-04-10 22:51:19 +06:00 |
|
Sebastiaan Janssen
|
1586f1679a
|
Merge with 4.11.7
|
2013-04-10 11:54:24 -02:00 |
|
Sebastiaan Janssen
|
809badd1cf
|
Update version to 4.11.7
|
2013-04-10 08:54:31 -02:00 |
|
Sebastiaan Janssen
|
da92ece774
|
Update version to 4.11.7
|
2013-04-10 07:57:56 -02:00 |
|
Sebastiaan Janssen
|
a531afb819
|
Don't need IronPython license any more either.
|
2013-04-10 07:46:05 -02:00 |
|
Sebastiaan Janssen
|
1d6009e3c7
|
Merge with 4.11.7
|
2013-04-10 07:42:21 -02:00 |
|
Sebastiaan Janssen
|
8dfeb1e616
|
Cleanup solution and folders, removes Linq2Umbraco and IronPython engine from
the project as we don't ship with them any more. Updated readme and docs.
|
2013-04-10 07:30:14 -02:00 |
|
Shannon Deminick
|
1b086e2267
|
fixes merge issue
|
2013-04-10 04:04:33 +06:00 |
|
Shannon Deminick
|
1f86d8c562
|
fixes merge issues
|
2013-04-10 03:56:10 +06:00 |
|
Shannon Deminick
|
25b9262cf1
|
Merge with 4.11.7
|
2013-04-10 03:51:53 +06:00 |
|
Shannon Deminick
|
1012a4814d
|
updates #U4-2070 for tiny mce plugins
|
2013-04-10 03:22:11 +06:00 |
|
Shannon Deminick
|
bae41cde14
|
updates #U4-2070 for skin module files in live editing
|
2013-04-10 03:16:26 +06:00 |
|
Shannon Deminick
|
b3260f05c0
|
updates #U4-2070 for templateskinning.aspx
|
2013-04-10 03:05:57 +06:00 |
|
Shannon Deminick
|
e33a79ac65
|
updates #U4-2070 for insertMasterpageContent.aspx
|
2013-04-10 03:02:10 +06:00 |
|
Shannon Deminick
|
c4dbabf654
|
updates #U4-2070 for translation/xml.aspx and translation/preview.aspx
|
2013-04-10 02:59:47 +06:00 |
|
Shannon Deminick
|
423643d66c
|
updates #U4-2070 for tinymce3/insertmacro.aspx
|
2013-04-10 02:46:11 +06:00 |
|
Shannon Deminick
|
4ccb655f73
|
updates #U4-2070 for members/search.aspx
|
2013-04-10 02:43:03 +06:00 |
|
Shannon Deminick
|
c8330d60f9
|
updates #U4-2070 for sendToTranslation.aspx
|
2013-04-10 02:41:22 +06:00 |
|
Shannon Deminick
|
a9aa3a04b5
|
updates #U4-2070 for search.aspx
|
2013-04-10 02:39:32 +06:00 |
|
Shannon Deminick
|
0bffa8e3f4
|
updates #U4-2070 for preview.aspx
|
2013-04-10 02:35:31 +06:00 |
|
Shannon Deminick
|
436322f58c
|
updates #U4-2070 for directoryBrowser.aspx
|
2013-04-10 02:34:44 +06:00 |
|
Shannon Deminick
|
e90c46dd78
|
updates #U4-2070 for canvas.aspx
|
2013-04-10 02:33:08 +06:00 |
|
Shannon Deminick
|
deda2534f8
|
updates #U4-2070 for SendPublish.aspx
|
2013-04-10 02:30:53 +06:00 |
|
Shannon Deminick
|
8112c13857
|
updates #U4-2070 for insertMacro.aspx
|
2013-04-10 02:28:50 +06:00 |
|
Shannon Deminick
|
57792de185
|
updates #U4-2070 for imageViewer.aspx
|
2013-04-10 02:21:59 +06:00 |
|
Shannon Deminick
|
e1f93029a5
|
updates #U4-2070 for assigndomain.aspx
|
2013-04-10 02:19:29 +06:00 |
|
Shannon Deminick
|
f64e0c7eb7
|
updates #U4-2070 for autodoc.aspx
|
2013-04-10 02:17:02 +06:00 |
|
Shannon Deminick
|
bf024e9011
|
updates #U4-2070 for assemblyBrowser.aspx
|
2013-04-10 02:14:13 +06:00 |
|
Shannon Deminick
|
036b888d30
|
updates #U4-2070 for ShowUmbracoTags.aspx
|
2013-04-10 02:08:56 +06:00 |
|
Shannon Deminick
|
1838a8dac5
|
updates #U4-2070 for NewRelationType.aspx
|
2013-04-10 02:07:16 +06:00 |
|
Shannon Deminick
|
205bf5fe4e
|
updates #U4-2070 for EditRelationType.aspx
|
2013-04-10 02:05:52 +06:00 |
|
Shannon Deminick
|
a50e192ab7
|
updates #U4-2070 for sort.aspx
|
2013-04-10 02:03:04 +06:00 |
|
Shannon Deminick
|
9684255e6e
|
ensures validation is correct in editContent, cleans up some code.
|
2013-04-10 01:58:22 +06:00 |
|
Shannon Deminick
|
72790d74f5
|
Fixes: #U4-2072 and cleans up some code.
|
2013-04-10 01:47:17 +06:00 |
|
Shannon Deminick
|
bb70bee6ae
|
Fixes: #U4-2071 and cleans up some code.
|
2013-04-10 01:42:15 +06:00 |
|
Shannon Deminick
|
0430e7966c
|
Fixes: #U4-2074 and cleans up a bit of code
|
2013-04-10 01:24:06 +06:00 |
|
Shannon Deminick
|
2e9a52b1f8
|
Fixes: #U4-2075
|
2013-04-10 00:56:43 +06:00 |
|
Sebastiaan Janssen
|
db4ed70d70
|
Merge with 4.11.7
|
2013-04-09 11:37:37 -02:00 |
|
Sebastiaan Janssen
|
e6ccd8a5b5
|
Fix for U4-2081 tinymce Image picker does not work in 6.03
|
2013-04-09 11:33:35 -02:00 |
|