Code

新功能公司／组织功能#695

Code

Merged

huacnlee merged 21 commits intomasterruby-china/homeland:masterfrom feature/teamruby-china/homeland:feature/teamCopy head branch name to clipboardJul 10, 2016

+1,330-177

Commits

Commits on Jul 10, 2016

• 添加 TeamUser Model 以及 Team Model

  huacnlee

  committed
  6e4689a

• 增加 Team 的权限定义;

  Show description for c9bce09
  huacnlee

  committed
  c9bce09

• 导航增加创建的下拉，用户名改成头像;

  huacnlee

  committed
  0d05599

• 调整用户栏

  huacnlee

  committed
  1f2c0e2

• Team 中文用公司／组织

  huacnlee

  committed
  7d3dea1

• 组织创建界面调整，增加测试;

  huacnlee

  committed
  681fd71

• 个人主页增加团队显示;

  huacnlee

  committed
  357d2c2

• Team has_many 通过 members 关联;

  huacnlee

  committed
  de252ae

• Add User.user_type

  huacnlee

  committed
  b2882fd

• users_controller 里面 render 根据类型选择不同的文件夹;

  huacnlee

  committed
  7ce2452

• Touch Team when members changed.

  huacnlee

  committed
  3581a9b

• 成员管理功能;

  huacnlee

  committed
  c64eed7

• 修复 UsersController 的 render 函数;

  huacnlee

  committed
  8fd8d22

• 组织成员接受，拒绝邀请，通知邀请等功能;

  huacnlee

  committed
  4fe569f

• Fix Jobs controller test

  huacnlee

  committed
  b97457d

• 话题关联到组织实现;

  huacnlee

  committed
  0bb65ee

• schema 里面删掉测试的表;

  huacnlee

  committed
  de8ad48

• 修正组织的 GitHub repos 获取;

  huacnlee

  committed
  667a642

• Teams#index 暂时 404

  huacnlee

  committed
  124f180

• Fix User.field_for_list

  huacnlee

  committed
  6b8060c

• Fix teams_controller_spec

  huacnlee

  committed
  f5e70d5