 huang
|
2e94fbee81
|
项目、课程、组织资源描述过长不能提交的问题
|
9 years ago |
|
huang
|
db54d6e0d9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/project.css
|
9 years ago |
|
huang
|
3ace67f706
|
版本库库代码统计导出excel功能
|
9 years ago |
 cxt
|
caf5602389
|
课程大纲教师团队的管理
|
9 years ago |
 daiao
|
3dc0e8407a
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/views/organizations/_org_member_list.html.erb
app/views/organizations/setting.html.erb
app/views/users/_project_news.html.erb
|
9 years ago |
|
daiao
|
27ad94eac2
|
组织配置界面，成员列表分页
|
9 years ago |
|
cxt
|
60beb2abab
|
首页左侧班级和项目列表的收藏功能
|
9 years ago |
|
cxt
|
56b74b755b
|
取消收藏
|
9 years ago |
 yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
2759d562ac
|
首页项目列表
|
9 years ago |
|
yuanke
|
ea926395c3
|
Merge branch 'develop' into weixin_guange
|
9 years ago |
|
huang
|
87c5f50545
|
PULL request 评论创建及局部刷新
|
9 years ago |
|
huang
|
6319a1bac6
|
PR添加评论定义
|
9 years ago |
|
yuanke
|
2b7ff3c76b
|
修改各个页面验证绑定登录的方式。
|
9 years ago |
|
huang
|
518d6bacbe
|
添加关闭pull request功能
|
9 years ago |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
0d86a28c54
|
我的作业
|
9 years ago |
|
huang
|
515649beb6
|
接受PR局部刷新及跳转
|
9 years ago |
|
cxt
|
cecf917764
|
从题库选用作业时增加提示：“您选中的题是“我收到的作业”，不能选用”
|
9 years ago |
|
huang
|
be081f5c66
|
添加Api（提交内容，改动）及相关方法路由
|
9 years ago |
|
huang
|
3660f8cbce
|
gitlab相关方法的封装
|
9 years ago |
|
huang
|
b718803bd9
|
修改控制器名称及控制器查询访问权限
|
9 years ago |
|
huang
|
96b04f39b1
|
pull requests框架搭建（路由控制器、views）
|
9 years ago |
|
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
9 years ago |
|
daiao
|
5b93d40f67
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/assets/wechat/app.html
public/assets/wechat/new_project.html
public/javascripts/wechat/directives/ellipsis.js
public/stylesheets/weui/weixin.css
|
9 years ago |
|
daiao
|
39478eb4e4
|
Merge branch 'dev_shcool' of https://git.trustie.net/jacknudt/trustieforge into dev_shcool
Conflicts:
app/views/admin/applied_schools.html.erb
app/views/admin/has_applied_schools.html.erb
|
9 years ago |
|
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
9 years ago |
|
daiao
|
3251890c91
|
Merge branch 'rep_quality' into dev_shcool
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
9 years ago |
|
cxt
|
e3d538c3fa
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/layouts/_course_base_info.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
335b82c046
|
加入班级的弹框
|
9 years ago |
|
daiao
|
5b30036639
|
单位名称列表功能
|
9 years ago |
|
huang
|
c07677ef99
|
项目邀请框架 拒绝消息
|
9 years ago |
|
cxt
|
a1a2b3dd33
|
Merge branch 'rep_quality' into cxt_course
Conflicts:
db/schema.rb
|
9 years ago |
|
cxt
|
848c56d54e
|
班级主页身份切换、成员管理页面的多重身份
|
9 years ago |
|
daiao
|
50ec127c5b
|
单位名称列表功能
|
9 years ago |
|
huang
|
c6bc5c9cb8
|
Merge branch 'dev_shcool' into rep_quality
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
7413298aad
|
项目邀请码申请及弹框
|
9 years ago |
|
daiao
|
9e788c9b6f
|
单位批准及消息框架搭建
|
9 years ago |
|
cxt
|
feb45a07bf
|
课程列表分为我创建的课程和我加入的课程
|
9 years ago |
|
huang
|
463c09f02c
|
项目邀请弹框
|
9 years ago |
|
daiao
|
5883b451ca
|
在管理员界面添加单位名称列表
|
9 years ago |
|
cxt
|
0564ddb6ea
|
课程大纲的回复
|
9 years ago |
|
huang
|
35172dab59
|
管理员界面单位申请框架
|
9 years ago |
|
cxt
|
9422e2886c
|
新版班级主页
|
9 years ago |
|
cxt
|
71b5fe1273
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/issues_controller.rb
app/views/issues/_issue_replies.html.erb
app/views/issues/_issue_reply_ke_form.html.erb
db/schema.rb
|
9 years ago |
|
cxt
|
7853b8aa54
|
班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合
|
9 years ago |
|
cxt
|
1c967ce569
|
Merge branch 'rep_quality' into develop
Conflicts:
app/views/users/_user_message_system.html.erb
app/views/users/_user_message_userfeedaback.html.erb
|
9 years ago |
|
cxt
|
b7e6725e1f
|
管理员界面的课程名称双击可点击
|
9 years ago |
|
huang
|
e766adf087
|
add delete to qa
|
9 years ago |
