Context Navigation

← Previous Change
Next Change →

Administration

Timestamp:

12/15/18 12:36:08 (6 years ago)

Author:

gkronber

Message:

#2892: Merging r15750:16382 (HEAD) from trunk to branch, resolving conflicts

Location:

branches/2892_LR-prediction-intervals

Files:

: 5 edited

. (modified) (3 props)
HeuristicLab.Clients.OKB.Views (modified) (1 prop)
HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/AlgorithmView.Designer.cs (modified) (4 diffs)
HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/OKBItemView.Designer.cs (modified) (1 diff)
HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/ProblemView.Designer.cs (modified) (4 diffs)

Legend:

: Unmodified
: Added
: Removed

branches/2892_LR-prediction-intervals

Property svn:ignore

-                      old
+                      new
+*.docstates
+*.psess
+*.resharper
+*.suo
+*.user
+*.vsp
+Doxygen
+FxCopResults.txt
+Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
+HeuristicLab 3.3.5.1.ReSharper.user
+HeuristicLab 3.3.6.0.ReSharper.user
+HeuristicLab.4.5.resharper.user
+HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
+HeuristicLab.resharper.user
+ProtoGen.exe
 TestResults
+_ReSharper.HeuristicLab
+_ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
+_ReSharper.HeuristicLab.ExtLibs
+bin
+protoc.exe
+obj
+.vs

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/2915-AbsoluteSymbol (added)	merged: 15943-15944,16236-16240,16304,16306,16332,16344-16352,16355
/branches/2916_IndexedDataTableSerialization (added)	merged: 15918
/branches/2937_SymReg_AnalyticalQuotient (added)	merged: 16083
/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 (added)	merged: 15587-15588
/trunk (added)	merged: 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,16309,16333-16334,16341-16343,16356-16362,16365-16366,16378-16379,16381-16382
/trunk/sources (added)	merged: 15589-15590

Property svn:global-ignores set to
*.nuget
packages

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.OKB.Views

Property svn:mergeinfo changed

/branches/2839_HiveProjectManagement/HeuristicLab.Clients.OKB.Views (added)	merged: 15953,16044,16057
/branches/2915-AbsoluteSymbol/HeuristicLab.Clients.OKB.Views (added)	merged: 16240
/trunk/HeuristicLab.Clients.OKB.Views (added)	merged: 16024-16025,16032-16033,16117,16356

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/AlgorithmView.Designer.cs

-                      r15583
+                      r16388
       this.usersTabPage = new System.Windows.Forms.TabPage();
       this.storeUsersButton = new System.Windows.Forms.Button();
       this.refreshableLightweightUserView = new HeuristicLab.Clients.Access.Views.RefreshableLightweightUserView();
+      this.refreshableLightweightUserView = new HeuristicLab.Clients.Access.Views.RefreshableLightweightAccessClientView();
       this.dataTabPage = new System.Windows.Forms.TabPage();
       this.noViewAvailableLabel = new System.Windows.Forms.Label();
 …
       // storeUsersButton
       //
       this.storeUsersButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
+      this.storeUsersButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
       this.storeUsersButton.Location = new System.Drawing.Point(37, 9);
       this.storeUsersButton.Name = "storeUsersButton";
 …
       // storeDataButton
       //
       this.storeDataButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
+      this.storeDataButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
       this.storeDataButton.Location = new System.Drawing.Point(36, 6);
       this.storeDataButton.Name = "storeDataButton";
 …
     private MainForm.WindowsForms.ViewHost dataViewHost;
     private System.Windows.Forms.Label noViewAvailableLabel;
     private Access.Views.RefreshableLightweightUserView refreshableLightweightUserView;
+    private Access.Views.RefreshableLightweightAccessClientView refreshableLightweightUserView;
+  }

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/OKBItemView.Designer.cs

r15583	r16388
52	52	// storeButton
53	53	//
54		this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.~~PublishToWeb~~;
	54	this.storeButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
55	55	this.storeButton.Location = new System.Drawing.Point(0, 0);
56	56	this.storeButton.Name = "storeButton";

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/ProblemView.Designer.cs

-                      r15583
+                      r16388
       this.usersTabPage = new System.Windows.Forms.TabPage();
       this.storeUsersButton = new System.Windows.Forms.Button();
       this.problemUserView = new HeuristicLab.Clients.Access.Views.RefreshableLightweightUserView();
+      this.problemUserView = new HeuristicLab.Clients.Access.Views.RefreshableLightweightAccessClientView();
       this.dataTabPage = new System.Windows.Forms.TabPage();
       this.noViewAvailableLabel = new System.Windows.Forms.Label();
 …
       // storeUsersButton
       //
       this.storeUsersButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
+      this.storeUsersButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
       this.storeUsersButton.Location = new System.Drawing.Point(38, 9);
       this.storeUsersButton.Name = "storeUsersButton";
 …
       // storeDataButton
       //
       this.storeDataButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.PublishToWeb;
+      this.storeDataButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
       this.storeDataButton.Location = new System.Drawing.Point(36, 6);
       this.storeDataButton.Name = "storeDataButton";
 …
     private MainForm.WindowsForms.ViewHost dataViewHost;
     private System.Windows.Forms.Label noViewAvailableLabel;
     private Access.Views.RefreshableLightweightUserView problemUserView;
+    private Access.Views.RefreshableLightweightAccessClientView problemUserView;
+  }

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

Context Navigation

Changeset 16388 for branches/2892_LR-prediction-intervals/HeuristicLab.Clients.OKB.Views/3.3/Administration

Legend:

branches/2892_LR-prediction-intervals

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.OKB.Views

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/AlgorithmView.Designer.cs

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/OKBItemView.Designer.cs

branches/2892_LR-prediction-intervals/HeuristicLab.Clients.OKB.Views/3.3/Administration/Views/ProblemView.Designer.cs

Download in other formats: