Context Navigation

← Previous Change
Next Change →

HeuristicLab.Clients.Hive.Administrator

Timestamp:

08/13/19 09:40:12 (5 years ago)

Author:

gkronber

Message:

#2994: merged r17132:17198 from trunk to branch

Location:

branches/2994-AutoDiffForIntervals

Files:

: 28 edited

. (modified) (1 prop)
HeuristicLab.Clients.Hive.Administrator (modified) (1 prop)
HeuristicLab.Clients.Hive.Administrator/3.3/HiveDowntime.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/MenuItems/AdministratorMenuItem.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Plugin.cs.frame (modified) (2 diffs)
HeuristicLab.Clients.Hive.Administrator/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
HeuristicLab.Clients.Hive.Administrator/3.3/RecurrentEvent.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeDialog.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeDialog.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourceView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/2994-AutoDiffForIntervals
- Property svn:mergeinfo changed
  /trunk merged: 17132,17137,17139,17150,17154,17179-17180,17182-17185,17191,17198
branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator
- Property svn:mergeinfo changed
  /trunk/HeuristicLab.Clients.Hive.Administrator merged: 17180,17184

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/HiveDowntime.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/MenuItems/AdministratorMenuItem.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Plugin.cs.frame

-                      r16565
+                      r17209
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 namespace HeuristicLab.Clients.Hive.Administration {
   [Plugin("HeuristicLab.Clients.Hive.Administrator", "3.3.15.$WCREV$")]
+  [Plugin("HeuristicLab.Clients.Hive.Administrator", "3.3.16.$WCREV$")]
   [PluginFile("HeuristicLab.Clients.Hive.Administrator-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Clients.Access", "3.3")]

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Properties/AssemblyInfo.cs.frame

-                      r16565
+                      r17209
 #region License Information
 /* HeuristicLab
  * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
  * This file is part of HeuristicLab.
 …
 [assembly: AssemblyCompany("HEAL")]
 [assembly: AssemblyProduct("HeuristicLab")]
 [assembly: AssemblyCopyright("(c) 2002-2018 HEAL")]
+[assembly: AssemblyCopyright("(c) HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 …
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
 [assembly: AssemblyFileVersion("3.3.15.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.16.$WCREV$")]

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/RecurrentEvent.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeDialog.Designer.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeDialog.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeView.Designer.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/DowntimeTypeView.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.Designer.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/HiveAdministratorView.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.Designer.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectJobsView.cs

r16911	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectPermissionsView.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectResourcesView.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectView.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ProjectsView.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.Designer.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/Recurrence.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourceView.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.Designer.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ResourcesView.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.Designer.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.Designer.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator/3.3/Views/SlaveView.cs

r16565	r17209
1	1	#region License Information
2	2	/* HeuristicLab
3		* Copyright (C) ~~2002-2019~~ Heuristic and Evolutionary Algorithms Laboratory (HEAL)
	3	* Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
4	4	*
5	5	* This file is part of HeuristicLab.

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

Context Navigation

Changeset 17209 for branches/2994-AutoDiffForIntervals/HeuristicLab.Clients.Hive.Administrator

Legend:

Download in other formats: