Ignore:
Timestamp:
08/18/15 10:08:58 (7 years ago)
Author:
ascheibe
Message:

#2388 merged hive statistics branch into trunk

Location:
trunk/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources

  • trunk/sources/HeuristicLab.Services.WebApp/3.3

    • Property svn:ignore
      •  

        old new  
        11Bin
         2HeuristicLab.Services.WebApp-3.3.csproj.user
  • trunk/sources/HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj

    r12559 r12878  
    1313    <AppDesignerFolder>Properties</AppDesignerFolder>
    1414    <RootNamespace>HeuristicLab.Services.WebApp</RootNamespace>
    15     <AssemblyName>HeuristicLab.Services.WebApp</AssemblyName>
     15    <AssemblyName>HeuristicLab.Services.WebApp-3.3</AssemblyName>
    1616    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1717    <MvcBuildViews>false</MvcBuildViews>
     
    118118    <Reference Include="System.Net.Http.WebRequest">
    119119    </Reference>
    120     <Reference Include="WebGrease, Version=1.6.5135.21930, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
    121       <SpecificVersion>False</SpecificVersion>
     120    <Reference Include="WebGrease">
    122121      <HintPath>..\..\packages\WebGrease.1.6.0\lib\WebGrease.dll</HintPath>
    123122    </Reference>
     
    146145    <Content Include="WebApp\libs\angularjs\angular-tablesort\angular-tablesort.js" />
    147146    <Content Include="WebApp\libs\angularjs\angular-tablesort\tablesort.css" />
     147    <Content Include="WebApp\libs\angularjs\fittext\ng-FitText.js" />
     148    <Content Include="WebApp\libs\cryptojs\aes.js" />
    148149    <Content Include="WebApp\main.js" />
    149150    <Content Include="WebApp\helper.js" />
     
    172173    <Content Include="WebApp\plugins\about\about.js" />
    173174    <Content Include="WebApp\plugins\about\aboutCtrl.js" />
    174     <Content Include="WebApp\plugins\login\login.css" />
    175     <Content Include="WebApp\plugins\login\login.js" />
    176     <Content Include="WebApp\plugins\login\loginCtrl.js" />
    177     <Content Include="WebApp\plugins\plugins\pluginsExceptionCtrl.js" />
    178     <Content Include="WebApp\plugins\plugins\plugins.js" />
    179     <Content Include="WebApp\plugins\plugins\pluginsCtrl.js" />
     175    <Content Include="WebApp\plugins\login\login.css">
     176      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     177    </Content>
     178    <Content Include="WebApp\plugins\login\login.js">
     179      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     180    </Content>
     181    <Content Include="WebApp\plugins\login\loginCtrl.js">
     182      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     183    </Content>
     184    <Content Include="WebApp\plugins\plugins\pluginsExceptionCtrl.js">
     185      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     186    </Content>
     187    <Content Include="WebApp\plugins\plugins\plugins.js">
     188      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     189    </Content>
     190    <Content Include="WebApp\plugins\plugins\pluginsCtrl.js">
     191      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     192    </Content>
    180193    <Content Include="WebApp\plugins\plugins\pluginsService.js" />
    181194    <Content Include="WebApp\shared\directives\flot.js" />
     
    208221    <Content Include="HeuristicLab.snk" />
    209222    <Content Include="Properties\AssemblyInfo.cs.frame" />
    210     <Content Include="Web.config" />
     223    <Content Include="Web.config">
     224      <SubType>Designer</SubType>
     225    </Content>
    211226    <Content Include="Web.Debug.config">
    212227      <DependentUpon>Web.config</DependentUpon>
     
    219234    <Content Include="WebApp\libs\bootstrap\fonts\glyphicons-halflings-regular.woff" />
    220235    <Content Include="WebApp\libs\bootstrap\fonts\glyphicons-halflings-regular.woff2" />
     236    <Content Include="WebApp\shared\directives\scrollToTop.js" />
    221237    <Content Include="WebApp\shared\filter\filters.js" />
    222238    <Content Include="WebApp\shared\images\HeuristicLab-Logo.png" />
     
    249265  </ItemGroup>
    250266  <ItemGroup>
     267    <None Include="Properties\PublishProfiles\WebApp.pubxml" />
    251268    <Content Include="WebApp\plugins\about\about.cshtml" />
    252269  </ItemGroup>
Note: See TracChangeset for help on using the changeset viewer.