Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/30/15 13:12:07 (9 years ago)
Author:
dglaser
Message:

#2388:

HeuristicLab.Services.Hive.DataAccess-3.3:

  • updated database schema
  • updated sql scripts
  • updated HiveStatisticsGenerator

HeuristicLab.Services.WebApp-3.3:

  • merged from trunk

HeuristicLab.Services.WebApp.Status-3.3:

  • updated data api controller

HeuristicLab.Services.WebApp.Statistics-3.3:

  • added exception page
  • improved jobs, clients, users and groups page
Location:
branches/HiveStatistics/sources
Files:
6 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/HiveStatistics/sources

  • branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs

    r12515 r12551  
    9090        .IncludeDirectory("~/WebApp/shared/services", "*.js", true)
    9191        .IncludeDirectory("~/WebApp/shared/directives", "*.js", true)
     92        .IncludeDirectory("~/WebApp/shared/filter", "*.js", true)
    9293        .IncludeDirectory("~/WebApp/shared/menu", "*.js", true)
    9394      );

  • branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj

    r12525 r12551  
    2323    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
    2424    <RestorePackages>true</RestorePackages>
    25     <WebGreaseLibPath>..\..\packages\WebGrease.1.5.2\lib</WebGreaseLibPath>
    2625  </PropertyGroup>
    2726  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    4443  </PropertyGroup>
    4544  <ItemGroup>
    46     <Reference Include="Antlr3.Runtime, Version=3.4.1.9004, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
    47       <HintPath>..\..\packages\Antlr.3.4.1.9004\lib\Antlr3.Runtime.dll</HintPath>
    48       <Private>True</Private>
     45    <Reference Include="Antlr3.Runtime, Version=3.5.0.2, Culture=neutral, PublicKeyToken=eb42632606e9261f, processorArchitecture=MSIL">
     46      <SpecificVersion>False</SpecificVersion>
     47      <HintPath>..\..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
    4948    </Reference>
    5049    <Reference Include="Microsoft.CSharp" />
    … …  
    5352      <Private>True</Private>
    5453    </Reference>
    55     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
    56       <HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
    57       <Private>True</Private>
     54    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
     55      <SpecificVersion>False</SpecificVersion>
     56      <HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
    5857    </Reference>
    5958    <Reference Include="System" />
    … …  
    119118    <Reference Include="System.Net.Http.WebRequest">
    120119    </Reference>
    121     <Reference Include="WebGrease, Version=1.5.2.14234, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
    122       <HintPath>..\..\packages\WebGrease.1.5.2\lib\WebGrease.dll</HintPath>
    123       <Private>True</Private>
     120    <Reference Include="WebGrease">
     121      <HintPath>..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
    124122    </Reference>
    125123  </ItemGroup>
    … …  
    170168    <Content Include="WebApp\libs\smoothScroll\smoothScroll.js" />
    171169    <Content Include="WebApp\app.js" />
     170    <Content Include="WebApp\plugins\about\about.js" />
     171    <Content Include="WebApp\plugins\about\aboutCtrl.js" />
    172172    <Content Include="WebApp\plugins\login\login.css">
    173173      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    … …  
    232232    <Content Include="WebApp\libs\bootstrap\fonts\glyphicons-halflings-regular.woff2" />
    233233    <Content Include="WebApp\shared\directives\scrollToTop.js" />
     234    <Content Include="WebApp\shared\filter\filters.js" />
    234235    <Content Include="WebApp\shared\images\HeuristicLab-Logo.png" />
    235236    <Content Include="WebApp\shared\layout\layout.cshtml" />
    … …  
    239240    <Content Include="WebApp\shared\menu\menu.cshtml" />
    240241    <Content Include="WebApp\shared\restricted\empty.cshtml" />
    241     <Content Include="WebApp\plugins\login\login.cshtml">
    242       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    243     </Content>
    244     <Content Include="WebApp\plugins\plugins\plugins.cshtml">
    245       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    246     </Content>
    247     <Content Include="WebApp\plugins\plugins\Web.config">
    248       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    249     </Content>
     242    <Content Include="WebApp\plugins\login\login.cshtml" />
     243    <Content Include="WebApp\plugins\plugins\plugins.cshtml" />
     244    <Content Include="WebApp\plugins\plugins\Web.config" />
    250245  </ItemGroup>
    251246  <ItemGroup>
    … …  
    268263  <ItemGroup>
    269264    <None Include="Properties\PublishProfiles\WebApp.pubxml" />
     265    <Content Include="WebApp\plugins\about\about.cshtml" />
    270266  </ItemGroup>
    271267  <PropertyGroup>

  • branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/plugins/plugins.cshtml

    r12525 r12551  
    3838                            </td>
    3939                            <td>
    40                                 <a ng-href="" data-ng-click="reloadPlugin(plugin.Name)">Reload</a>
     40                                <a ng-href="" class="cursor-pointer" data-ng-click="reloadPlugin(plugin.Name)">Reload</a>
    4141                            </td>
    4242                        </tr>

  • branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/shared/layout/layout.cshtml

    r12515 r12551  
    6969                            </li>
    7070                            <li>
    71                                 <a ng-href="" data-ng-click="logout()">Logout</a>
     71                                <a ng-href="#" data-ng-click="logout()">Logout</a>
    7272                            </li>
    7373                        }

  • branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/packages.config

    r12430 r12551  
    11<?xml version="1.0" encoding="utf-8"?>
    22<packages>
    3   <package id="Antlr" version="3.4.1.9004" targetFramework="net45" />
     3  <package id="Antlr" version="3.5.0.2" targetFramework="net45" />
    44  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
    55  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
    … …  
    1111  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
    1212  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
    13   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
    14   <package id="WebGrease" version="1.5.2" targetFramework="net45" />
     13  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
     14  <package id="WebGrease" version="1.6.0" targetFramework="net45" />
    1515</packages>
Note: See TracChangeset for help on using the changeset viewer.