yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adds latest MB version

Browse Source
This commit is contained in:
Shannon
2016-01-15 17:06:22 +01:00
parent c39b8f6eb5
commit 97d64f4f3d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI/App_Plugins/ModelsBuilder/modelsbuilder.controller.js
View File

@@ -1,4 +1,4 @@
function modelsBuilderController($scope, umbRequestHelper, $log, $http) {
function modelsBuilderController($scope, umbRequestHelper, $log, $http /*, $sce*/) {
$scope.generate = function() {
$scope.generating = true;
@@ -15,7 +15,7 @@
$http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetDashboard")),
'Failed to get dashboard.')
.then(function (result) {
//result.text = $sce.trustAsHtml(result.text);
//result.text = $sce.trustAsHtml(result.text); // accept html
$scope.dashboard = result;
$scope.ready = true;
});

8
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -350,12 +350,12 @@
<Name>umbraco.providers</Name>
</ProjectReference>
<Reference Include="System.Xml.Linq" />
<Reference Include="Umbraco.ModelsBuilder, Version=2.2.0.64, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Umbraco.ModelsBuilder.2.2.0-beta002\lib\Umbraco.ModelsBuilder.dll</HintPath>
<Reference Include="Umbraco.ModelsBuilder, Version=2.2.0.70, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Umbraco.ModelsBuilder.2.2.0-beta003\lib\Umbraco.ModelsBuilder.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Umbraco.ModelsBuilder.AspNet, Version=2.2.0.64, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Umbraco.ModelsBuilder.AspNet.2.2.0-beta002\lib\Umbraco.ModelsBuilder.AspNet.dll</HintPath>
<Reference Include="Umbraco.ModelsBuilder.AspNet, Version=2.2.0.70, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Umbraco.ModelsBuilder.AspNet.2.2.0-beta003\lib\Umbraco.ModelsBuilder.AspNet.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">

4
src/Umbraco.Web.UI/packages.config
View File

@@ -37,7 +37,7 @@
<package id="SqlServerCE" version="4.0.0.0" targetFramework="net45" />
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
<package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
<package id="Umbraco.ModelsBuilder" version="2.2.0-beta002" targetFramework="net45" />
<package id="Umbraco.ModelsBuilder.AspNet" version="2.2.0-beta002" targetFramework="net45" />
<package id="Umbraco.ModelsBuilder" version="2.2.0-beta003" targetFramework="net45" />
<package id="Umbraco.ModelsBuilder.AspNet" version="2.2.0-beta003" targetFramework="net45" />
<package id="UrlRewritingNet.UrlRewriter" version="2.0.7" targetFramework="net45" />
</packages>