- Timestamp:
- 03/28/19 16:54:20 (5 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/2520_PersistenceReintegration/HeuristicLab.Services.WebApp merged eligible /branches/2839_HiveProjectManagement/HeuristicLab.Services.WebApp merged eligible /branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Services.WebApp merged eligible /branches/2965_CancelablePersistence/HeuristicLab.Services.WebApp merged eligible /stable/HeuristicLab.Services.WebApp merged eligible /trunk/HeuristicLab.Services.WebApp merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Services.WebApp 10321-10322 /branches/2892_LR-prediction-intervals/HeuristicLab.Services.WebApp 15743-16388 /branches/2915-AbsoluteSymbol/HeuristicLab.Services.WebApp 15943-16355 /branches/Algorithms.GradientDescent/HeuristicLab.Services.WebApp 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Services.WebApp 6917-7005 /branches/CloningRefactoring/HeuristicLab.Services.WebApp 4656-4721 /branches/CodeEditor/HeuristicLab.Services.WebApp 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Services.WebApp 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Services.WebApp 5815-6180 /branches/DataAnalysis/HeuristicLab.Services.WebApp 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Services.WebApp 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Services.WebApp 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Services.WebApp 5060 /branches/HLScript/HeuristicLab.Services.WebApp 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.WebApp 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Services.WebApp 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Services.WebApp 11130-12721 /branches/HiveProjectManagement/HeuristicLab.Services.WebApp 15377-15760 /branches/HiveStatistics/sources/HeuristicLab.Services.WebApp 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.Services.WebApp 10202-10483 /branches/NET40/sources/HeuristicLab.Services.WebApp 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Services.WebApp 12033-12122 /branches/ParallelEngine/HeuristicLab.Services.WebApp 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Services.WebApp 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Services.WebApp 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Services.WebApp 6828 /branches/RuntimeOptimizer/HeuristicLab.Services.WebApp 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Services.WebApp 7787-8333 /branches/SlaveShutdown/HeuristicLab.Services.WebApp 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Services.WebApp 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Services.WebApp 5370-5682 /branches/Trunk/HeuristicLab.Services.WebApp 6829-6865 /branches/UnloadJobs/HeuristicLab.Services.WebApp 9168-9215 /branches/VNS/HeuristicLab.Services.WebApp 5594-5752 /branches/crossvalidation-2434/HeuristicLab.Services.WebApp 12948-12950 /branches/histogram/HeuristicLab.Services.WebApp 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Configs/FilterConfig.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Configs/RouteConfig.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Configs/WebApiConfig.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Controllers/AppController.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Controllers/AuthenticationController.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Controllers/DataTransfer/Plugin.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Controllers/DataTransfer/User.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Controllers/PluginController.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Controllers/WebAppControllerSelector.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Global.asax.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj
r12878 r16723 14 14 <RootNamespace>HeuristicLab.Services.WebApp</RootNamespace> 15 15 <AssemblyName>HeuristicLab.Services.WebApp-3.3</AssemblyName> 16 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>16 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 17 17 <MvcBuildViews>false</MvcBuildViews> 18 18 <UseIISExpress>true</UseIISExpress> … … 23 23 <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> 24 24 <RestorePackages>true</RestorePackages> 25 <UseGlobalApplicationHostFile /> 25 26 </PropertyGroup> 26 27 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> … … 234 235 <Content Include="WebApp\libs\bootstrap\fonts\glyphicons-halflings-regular.woff" /> 235 236 <Content Include="WebApp\libs\bootstrap\fonts\glyphicons-halflings-regular.woff2" /> 236 <Content Include="WebApp\shared\directives\scrollToTop.js" />237 237 <Content Include="WebApp\shared\filter\filters.js" /> 238 238 <Content Include="WebApp\shared\images\HeuristicLab-Logo.png" /> -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Plugin.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/PluginManager.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Properties/AssemblyInfo.cs.frame
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/Web.config
r16692 r16723 4 4 <remove name="HeuristicLab.Authentication" /> 5 5 <remove name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" /> 6 <add name="HeuristicLab.Authentication" connectionString="Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />7 <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source= .\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.3" />6 <add name="HeuristicLab.Authentication" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" /> 7 <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.4" /> 8 8 </connectionStrings> 9 9 -
branches/2521_ProblemRefactoring/HeuristicLab.Services.WebApp/3.3/WebApp/shared/layout/layout.cshtml
r16692 r16723 1 1 @* HeuristicLab 2 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)2 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 3 3 * 4 4 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.