Context Navigation

← Previous Change
Next Change →

WebApi

Timestamp:

11/20/18 15:26:57 (6 years ago)

Author:

pfleck

Message:

#2845 Merged trunk changes into branch (15406-15681, 15683-16308)

Location:

branches/2845_EnhancedProgress

Files:

: 12 edited

. (modified) (1 prop)
HeuristicLab.Services.WebApp.Maintenance (modified) (1 prop)
HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/DataTransfer/FactClientInfo.cs (modified) (1 diff)
HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/DataTransfer/Job.cs (modified) (1 diff)
HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/DataTransfer/JobPage.cs (modified) (1 diff)
HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/DataTransfer/Plugin.cs (modified) (1 diff)
HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/DataTransfer/PluginPage.cs (modified) (1 diff)
HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/DataTransfer/TableInformation.cs (modified) (1 diff)
HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/FactClientInfoController.cs (modified) (1 diff)
HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/FactTaskController.cs (modified) (1 diff)
HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/PluginController.cs (modified) (1 diff)
HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/SpaceUsageController.cs (modified) (4 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/2845_EnhancedProgress

Property svn:mergeinfo changed

/branches/2839_HiveProjectManagement (added)	merged: 15761,15767-15768,15777,15792,15813,15819,15908,15913-15914,15920,15922,15925,15933,15953-15956,15966,15969,15978,15992,15995,16040,16043-16044,16050,16057,16060,16062,16064,16066,16068,16072,16089,16091-16095,16116
/branches/2916_IndexedDataTableSerialization (added)	merged: 15918
/branches/HiveProjectManagement (added)	merged: 15377-15380,15399,15401,15411-15412,15422,15496-15497,15500,15503,15508,15523,15526-15528,15530,15540,15546-15547,15552,15557,15559,15567,15576-15577,15580,15627-15628,15630,15641-15644,15658-15659,15666,15671,15715-15716,15737,15742,15760
/stable	merged: 15587-15588
/trunk (added)	merged: 15706-15708,15727-15730,15738-15739,15751-15755,15766,15769,15782-15783,15785-15787,15789-15790,15793,15796-15799,15802,15810,15818,15829,15839,15845,15853-15855,15869,15871,15882,15891,15902,15931-15932,15934,15940,15951-15952,15972,15983,15998-15999,16015,16021,16023-16025,16032-16033,16054,16059,16063,16071,16084-16086,16117-16118,16120,16122,16168-16169,16177,16179,16184-16187,16202-16209,16211,16213,16216,16218-16219,16221,16223-16224,16232,16241-16244,16252,16255,16257-16261,16263-16264,16266-16267,16269-16274,16276-16280,16283-16287,16289-16294,16296-16298,16301-16302,16305
/trunk/sources (added)	merged: 15408-15409,15419,15427,15447-15448,15452,15461,15464,15478,15480-15481,15483,15486,15498-15499,15502,15505,15513,15517-15518,15532,15534,15545,15548,15551,15556,15560,15566,15581,15583,15589-15591,15594,15596,15598,15607,15610-15611,15619,15621-15623,15626,15637-15638,15645,15665,15667,15672-15674

branches/2845_EnhancedProgress/HeuristicLab.Services.WebApp.Maintenance

Property svn:mergeinfo set to (toggle deleted branches)

/branches/2839_HiveProjectManagement/HeuristicLab.Services.WebApp.Maintenance	merged	eligible
/stable/HeuristicLab.Services.WebApp.Maintenance	merged	eligible
/trunk/HeuristicLab.Services.WebApp.Maintenance	merged	eligible
/branches/1721-RandomForestPersistence/HeuristicLab.Services.WebApp.Maintenance	10321-10322
/branches/Algorithms.GradientDescent/HeuristicLab.Services.WebApp.Maintenance	5516-5520
/branches/Async/HeuristicLab.Services.WebApp.Maintenance	13329-15286
/branches/Benchmarking/sources/HeuristicLab.Services.WebApp.Maintenance	6917-7005
/branches/CloningRefactoring/HeuristicLab.Services.WebApp.Maintenance	4656-4721
/branches/CodeEditor/HeuristicLab.Services.WebApp.Maintenance	11700-11806
/branches/DataAnalysis Refactoring/HeuristicLab.Services.WebApp.Maintenance	5471-5808
/branches/DataAnalysis SolutionEnsembles/HeuristicLab.Services.WebApp.Maintenance	5815-6180
/branches/DataAnalysis/HeuristicLab.Services.WebApp.Maintenance	4458-4459,4462,4464
/branches/DataPreprocessing/HeuristicLab.Services.WebApp.Maintenance	10085-11101
/branches/GP.Grammar.Editor/HeuristicLab.Services.WebApp.Maintenance	6284-6795
/branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Services.WebApp.Maintenance	5060
/branches/HLScript/HeuristicLab.Services.WebApp.Maintenance	10331-10358
/branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Services.WebApp.Maintenance	11570-12508
/branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Services.WebApp.Maintenance	6123-9799
/branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Services.WebApp.Maintenance	11130-12721
/branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Maintenance	12440-12877
/branches/LogResidualEvaluator/HeuristicLab.Services.WebApp.Maintenance	10202-10483
/branches/NET40/sources/HeuristicLab.Services.WebApp.Maintenance	5138-5162
/branches/NSGA-II Changes/HeuristicLab.Services.WebApp.Maintenance	12033-12122
/branches/ParallelEngine/HeuristicLab.Services.WebApp.Maintenance	5175-5192
/branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Services.WebApp.Maintenance	7568-7810
/branches/QAPAlgorithms/HeuristicLab.Services.WebApp.Maintenance	6350-6627
/branches/Restructure trunk solution/HeuristicLab.Services.WebApp.Maintenance	6828
/branches/RuntimeOptimizer/HeuristicLab.Services.WebApp.Maintenance	8943-9078
/branches/ScatterSearch (trunk integration)/HeuristicLab.Services.WebApp.Maintenance	7787-8333
/branches/SlaveShutdown/HeuristicLab.Services.WebApp.Maintenance	8944-8956
/branches/SpectralKernelForGaussianProcesses/HeuristicLab.Services.WebApp.Maintenance	10204-10479
/branches/SuccessProgressAnalysis/HeuristicLab.Services.WebApp.Maintenance	5370-5682
/branches/Trunk/HeuristicLab.Services.WebApp.Maintenance	6829-6865
/branches/UnloadJobs/HeuristicLab.Services.WebApp.Maintenance	9168-9215
/branches/VNS/HeuristicLab.Services.WebApp.Maintenance	5594-5752
/branches/crossvalidation-2434/HeuristicLab.Services.WebApp.Maintenance	12948-12950
/branches/histogram/HeuristicLab.Services.WebApp.Maintenance	5959-6341
/branches/symbreg-factors-2650/HeuristicLab.Services.WebApp.Maintenance	14232-14825

branches/2845_EnhancedProgress/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/DataTransfer/FactClientInfo.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/DataTransfer/Job.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/DataTransfer/JobPage.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/DataTransfer/Plugin.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/DataTransfer/PluginPage.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/DataTransfer/TableInformation.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/FactClientInfoController.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/FactTaskController.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/PluginController.cs

r16308	r16311
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2845_EnhancedProgress/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/SpaceUsageController.cs

-                      r16308
+                      r16311
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
     public IEnumerable<TableInformation> GetHiveTableInformation() {
       var tables = new List<string> {
+        "AssignedResources",
+        "AssignedJobResource",
+        "AssignedProjectResource",
         "Downtime",
         "Job",
 …
         "Plugin",
         "PluginData",
+        "Project",
+        "ProjectPermission",
         "RequiredPlugins",
         "Resource",
-        "ResourcePermission",
         "StateLog",
         "Task",
 …
         "statistics.DimClient",
         "statistics.DimJob",
+        "statistics.DimProject",
         "statistics.DimTime",
         "statistics.DimUser",
         "statistics.FactClientInfo",
+        "statistics.FactProjectInfo",
         "statistics.FactTask"
       };

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 16311 for branches/2845_EnhancedProgress/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi

Legend:

Download in other formats: