Shannon
|
c0380e491b
|
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
Conflicts:
src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/umbraco/controls/Tree/TreeControl.ascx.cs
src/umbraco.controls/TreePicker/SimpleContentPicker.cs
|
2013-12-19 11:41:03 +11:00 |
|
Shannon
|
8656d3e4b9
|
adds some null checks, removes old unused webforms files for tree control
|
2013-12-19 11:35:53 +11:00 |
|
perploug
|
4891c54ef5
|
Migrated the old content picker to the new dialogs
|
2013-09-18 15:44:50 +02:00 |
|
Jeremy Pyne
|
e65a71a05a
|
Added code to pre-select the current node in content tree pickers based on the location of the document in the tree.
This is a HUGE time saver with an even moderately complex site hierarchy.
|
2013-08-29 11:14:51 -04:00 |
|
leekelleher
|
b6ec364156
|
Updated references to the new constants for Application and MediaType aliases.
|
2013-03-22 13:13:05 +00:00 |
|
shannon@ShandemVaio.home
|
580cb340ac
|
Cleaning up folder structure (U4-56)
|
2012-06-22 20:39:48 +04:00 |
|