Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: Mdi
Commits on Nov 27, 2012
Commits on Nov 7, 2012
  1. Merge remote-tracking branch 'qicb/Mandel' into Mdi

    authored
    Conflicts:
    	Application/frmItemNew.cs
    	Application/frmPlan.Designer.cs
  2. Merge remote-tracking branch 'hefangli/master' into Mdi

    authored
    Conflicts:
    	Application/frmCardNew.Designer.cs
Commits on Nov 6, 2012
  1. @hefangli
  2. Merge remote-tracking branch 'katway/Mdi' into Develop

    qicb authored
    Conflicts:
    	Application/frmAddPlan.resx
    	Application/frmAddPlanExamine.resx
    	Application/frmItemAdd.Designer.cs
    	Application/frmItemAdd.cs
    	Application/frmMachineNew.Designer.cs
    	Application/frmMachineNew.cs
    	Application/frmMain.Designer.cs
    	Application/frmMain.cs
    	Application/frmPlan.Designer.cs
    	Application/frmPlan.cs
    	Application/frmPlan.resx
    	Application/frmPlanExamine.Designer.cs
    	Application/frmPointNew.Designer.cs
    	Application/frmPointNew.cs
    	Application/frmRoutNameAdd.cs
    	Application/frmRouteNew.Designer.cs
    	Application/frmRouteNew.cs
  3. Merge remote-tracking branch 'katway/Develop' into Develop

    qicb authored
    Conflicts:
    	Application/frmMain.cs
  4. 细节修改

    qicb authored
Commits on Nov 5, 2012
  1. @hefangli
Commits on Nov 2, 2012
  1. 细节调整

    qicb authored
  2. @hefangli
  3. 增加线程

    qicb authored
  4. @hefangli
  5. 调整窗体名称和主窗体对应菜单项名称

    authored
    1.调整窗体名称和主窗体对应菜单项名称
    2.使用反射调用相应窗体
    3.其它杂项
  6. @hefangli

    提交新修改过的问题

    hefangli authored
  7. Merge remote-tracking branch 'hefangli/master' into Mdi

    authored
    Conflicts:
    	Application/frmMain.Designer.cs
  8. Merge remote-tracking branch 'hefangli/master' into Mdi

    authored
    Conflicts:
    	Application/WorkStation.csproj
    	Application/frmMain.Designer.cs
    	Application/frmMain.cs
    	Application/frmMain.resx
  9. @hefangli
Commits on Nov 1, 2012
  1. 使用反射调用窗体

    authored
  2. @hefangli
  3. @hefangli
  4. @hefangli
Commits on Oct 31, 2012
  1. 部分修正

    qicb authored
  2. @hefangli
  3. @hefangli

    Merge remote-tracking branch 'qichuanbo/Develop'

    hefangli authored
    Conflicts:
    	Application/frmMain.Designer.cs
    	Application/frmMain.cs
  4. @hefangli

    Merge remote-tracking branch 'qichuanbo/Develop'

    hefangli authored
    Conflicts:
    	Application/frmMain.Designer.cs
    	Application/frmMain.cs
  5. 基础核心功能初步完成

    authored
    1.任务管理,基础信息,卡片管理
  6. 修正.csproj文件

    authored
  7. @hefangli

    提交改动的文本

    hefangli authored
Commits on Oct 30, 2012
  1. Merge remote-tracking branch 'qicb/Develop' into Develop

    authored
    Conflicts:
    	Application/WorkStation.csproj
    	Application/WorkStation.csproj.orig
    	Application/frmMain.Designer.cs
    	Application/frmMain.cs
    	Application/frmMain.cs.orig
    	Application/frmMain.resx
  2. 修正性提交

    authored
  3. 清理文件

    qicb authored
  4. Merge remote-tracking branch 'origin/Develop' into Develop

    qicb authored
    Conflicts:
    	Application/frmMain.cs
    	Application/frmMain.cs~HEAD
    	Application/frmain.cs
  5. main修正——点项

    qicb authored
Something went wrong with that request. Please try again.