 yuanke
|
93ed72fb59
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-10-28 15:57:53 +08:00 |
 cxt
|
cc2ef93808
|
多选题的上限
|
2016-10-27 18:25:47 +08:00 |
 huang
|
3ef90a3c62
|
Merge branch 'dev_newproject' into develop
Conflicts:
db/schema.rb
|
2016-10-27 17:33:28 +08:00 |
|
huang
|
05b206a7cf
|
收藏者列表
|
2016-10-27 12:39:44 +08:00 |
|
cxt
|
3d29eb2be0
|
分班批量添加学生、小班页面
|
2016-10-21 17:34:02 +08:00 |
|
yuanke
|
8e35158fe9
|
增加统计功能
|
2016-10-21 14:06:45 +08:00 |
|
cxt
|
f085b79999
|
个人主页的调整
|
2016-10-20 10:50:59 +08:00 |
|
cxt
|
6109a1602b
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-10-19 18:11:02 +08:00 |
|
cxt
|
e102815f60
|
个人主页
|
2016-10-19 18:03:59 +08:00 |
|
huang
|
97172ed76f
|
版本库异步加载
|
2016-10-19 15:18:26 +08:00 |
|
huang
|
fce6c407c8
|
Merge branch 'rep_quality' into dev_newproject
Conflicts:
app/controllers/projects_controller.rb
app/views/layouts/base_projects.html.erb
app/views/projects/settings/_new_edit.html.erb
public/stylesheets/css/project.css
|
2016-10-19 11:27:49 +08:00 |
|
huang
|
207273839b
|
Merge branch 'dev_newrep' into dev_newproject
Conflicts:
app/controllers/projects_controller.rb
app/views/projects/settings/_new_repositories.html.erb
|
2016-10-19 08:53:38 +08:00 |
|
cxt
|
a289a2cee0
|
班级问卷：新建时只保存并设置学生可查看统计列表，再到问卷列表中去发布，但实际学生不能查看统计结果
|
2016-10-15 15:16:21 +08:00 |
|
huang
|
5532ec3b86
|
Merge branch 'develop' into dev_newproject
Conflicts:
app/views/issues/index.html.erb
app/views/layouts/base_projects.html.erb
public/stylesheets/css/project.css
|
2016-10-15 10:53:01 +08:00 |
|
huang
|
80bf13c516
|
资源库删除历史版本功能
|
2016-10-14 19:21:41 +08:00 |
|
cxt
|
a1b70a7e91
|
Merge branch 'cxt_course' into develop
|
2016-10-14 16:18:12 +08:00 |
|
cxt
|
12ad7c1612
|
班级讨论区增加二级子栏目
|
2016-10-14 14:28:19 +08:00 |
|
huang
|
edf2a059e8
|
Merge branch 'develop' into rep_quality
|
2016-10-13 09:00:35 +08:00 |
|
huang
|
57d1397597
|
版本库界面优化（未完）
|
2016-10-12 10:45:14 +08:00 |
|
huang
|
3c15c4f315
|
版本库权限，及项目收藏用户列表
|
2016-10-11 10:03:00 +08:00 |
|
huang
|
e9a1582b71
|
项目添加收藏功能
|
2016-10-11 09:30:45 +08:00 |
|
huang
|
2e94fbee81
|
项目、课程、组织资源描述过长不能提交的问题
|
2016-10-09 15:09:18 +08:00 |
 daiao
|
b259f92381
|
一级帖子栏目默认展示5个，点击可进入详情页面，
|
2016-10-09 09:02:12 +08:00 |
|
huang
|
db54d6e0d9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/project.css
|
2016-09-26 22:21:45 +08:00 |
|
huang
|
3ace67f706
|
版本库库代码统计导出excel功能
|
2016-09-26 16:17:21 +08:00 |
|
cxt
|
caf5602389
|
课程大纲教师团队的管理
|
2016-09-23 09:22:47 +08:00 |
|
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
|
2016-09-05 13:47:39 +08:00 |
|
daiao
|
27ad94eac2
|
组织配置界面，成员列表分页
|
2016-09-02 13:25:01 +08:00 |
|
cxt
|
60beb2abab
|
首页左侧班级和项目列表的收藏功能
|
2016-08-25 11:30:47 +08:00 |
|
cxt
|
56b74b755b
|
取消收藏
|
2016-08-24 17:30:30 +08:00 |
|
yuanke
|
9446760258
|
Merge branch 'weixin_guange' into develop
Conflicts:
db/schema.rb
|
2016-08-14 09:56:17 +08:00 |
|
cxt
|
2759d562ac
|
首页项目列表
|
2016-08-13 15:35:03 +08:00 |
|
yuanke
|
ea926395c3
|
Merge branch 'develop' into weixin_guange
|
2016-08-11 11:19:52 +08:00 |
|
huang
|
87c5f50545
|
PULL request 评论创建及局部刷新
|
2016-08-09 14:51:48 +08:00 |
|
huang
|
6319a1bac6
|
PR添加评论定义
|
2016-08-09 10:53:44 +08:00 |
|
yuanke
|
2b7ff3c76b
|
修改各个页面验证绑定登录的方式。
|
2016-08-09 09:23:06 +08:00 |
|
huang
|
518d6bacbe
|
添加关闭pull request功能
|
2016-08-08 15:23:55 +08:00 |
|
cxt
|
3178700131
|
Merge branch 'cxt_course' into develop
|
2016-08-05 16:14:56 +08:00 |
|
cxt
|
0d86a28c54
|
我的作业
|
2016-08-05 16:12:53 +08:00 |
|
huang
|
515649beb6
|
接受PR局部刷新及跳转
|
2016-08-04 15:07:15 +08:00 |
|
cxt
|
cecf917764
|
从题库选用作业时增加提示：“您选中的题是“我收到的作业”，不能选用”
|
2016-08-03 15:00:16 +08:00 |
|
huang
|
be081f5c66
|
添加Api（提交内容，改动）及相关方法路由
|
2016-08-03 13:57:59 +08:00 |
|
huang
|
3660f8cbce
|
gitlab相关方法的封装
|
2016-08-01 17:38:37 +08:00 |
|
huang
|
b718803bd9
|
修改控制器名称及控制器查询访问权限
|
2016-08-01 16:54:31 +08:00 |
|
huang
|
96b04f39b1
|
pull requests框架搭建（路由控制器、views）
|
2016-08-01 15:33:47 +08:00 |
|
daiao
|
911a769670
|
Merge branch 'develop' into dev_shcool
Conflicts:
app/models/applied_message.rb
|
2016-07-29 22:05:56 +08:00 |
|
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
|
2016-07-29 22:03:45 +08:00 |
|
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
|
2016-07-29 21:50:19 +08:00 |
|
huang
|
847cae6d41
|
Merge branch 'develop' into rep_quality
Conflicts:
app/models/applied_message.rb
db/schema.rb
|
2016-07-29 21:39:00 +08:00 |
|
yuanke
|
1f47eb5ea8
|
单位申请列表修改
|
2016-07-29 21:19:09 +08:00 |