yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
8121fc42e5a22fe45bba9ce5717faccfae213d29
Umbraco-CMS/src/umbraco.controls/TreePicker
History
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
..
BaseTreePicker.cs
fixes serverside part of legacy pickers
2013-11-18 11:49:11 +01:00
BaseTreePicker.js
fixes serverside part of legacy pickers
2013-11-18 11:49:11 +01:00
BaseTreePickerScripts.Designer.cs
…
BaseTreePickerScripts.resx
…
SimpleContentPicker.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2013-12-19 11:41:03 +11:00
SimpleMediaPicker.cs
Migrated the old content picker to the new dialogs
2013-09-18 15:44:50 +02:00