 daiao
|
0f328d36e1
|
代码改进
|
2016-12-12 10:00:05 +08:00 |
|
daiao
|
fb62d4f1b2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/project.css
|
2016-12-09 20:00:07 +08:00 |
|
daiao
|
92bc7aa813
|
个人首页的7个tab
|
2016-12-09 19:32:00 +08:00 |
 huang
|
41b6c64af3
|
Merge branch 'guange_dev' into develop
|
2016-12-09 16:53:18 +08:00 |
 guange
|
34b14b4e51
|
微信bug修改
|
2016-12-09 16:52:01 +08:00 |
|
黄井泉
|
b8eee2b131
|
Merge branch 'cxt_course' into 'develop'
本周上线任务
See merge request !50
|
2016-12-09 16:43:00 +08:00 |
 cxt
|
0b217b9998
|
基于项目的分做作业，关联项目列表需要增加“更换项目”的功能
|
2016-12-09 16:39:24 +08:00 |
|
黄井泉
|
74a20dddc1
|
Merge branch 'dev_newproject' into 'develop'
Issue和commit关联功能
See merge request !49
|
2016-12-09 14:17:06 +08:00 |
|
huang
|
2a5bb6dcb8
|
Merge branch 'guange_dev' into develop
Conflicts:
Gemfile
|
2016-12-09 09:35:12 +08:00 |
|
huang
|
d98b1e17cc
|
Gitlab提供搜索接口，commit 关联提供搜索功能及局部刷新
|
2016-12-08 16:36:11 +08:00 |
|
cxt
|
9ca4001c8c
|
追加附件的调整
|
2016-12-08 15:29:51 +08:00 |
|
daiao
|
1875b6ecf7
|
个人首页的项目社区
|
2016-12-08 14:14:52 +08:00 |
|
cxt
|
abdbfd87b0
|
班级的邀请码增加“停用”和“启用”功能，停用的邀请码不允许用户主动加入班级
|
2016-12-08 13:40:11 +08:00 |
|
huang
|
0785c71308
|
issue和commit关联的一些修改和调整
|
2016-12-08 11:26:37 +08:00 |
|
daiao
|
224c0b686c
|
个人首页的课程社区
|
2016-12-08 09:59:22 +08:00 |
|
huang
|
a1a96e4667
|
issue编辑优化，性能简单优化
|
2016-12-08 09:55:41 +08:00 |
|
huang
|
122946804d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-12-08 09:36:36 +08:00 |
|
cxt
|
c24f9b8c3b
|
作业的小齿轮菜单增加“启用匿评”的选项，同时更新“禁用匿评”的提示信息、禁用匿评的作业截止后也可以编辑“是否启用匿评”
|
2016-12-07 17:23:52 +08:00 |
|
huang
|
64b8c0c3f3
|
issue edit方法优化
|
2016-12-07 15:47:57 +08:00 |
|
cxt
|
9a830fc907
|
Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
app/views/layouts/new_base_user.html.erb
|
2016-12-07 15:21:25 +08:00 |
|
cxt
|
27d800a94a
|
新版首页架构
|
2016-12-07 15:15:00 +08:00 |
|
daiao
|
69d9228808
|
个人主页的消息页面
|
2016-12-07 15:13:51 +08:00 |
|
huang
|
c256462170
|
issue与commit关联的更新操作
|
2016-12-07 14:03:07 +08:00 |
|
huang
|
378427d070
|
issue 关联commit 流程及数据创建
|
2016-12-07 10:53:36 +08:00 |
|
daiao
|
e6763c6d0c
|
用户消息铃铛样式调整
|
2016-12-07 09:00:33 +08:00 |
|
huang
|
33a4186e69
|
完成issue和commit关联创建。去重，及相关局部刷新
|
2016-12-06 17:37:07 +08:00 |
|
cxt
|
494946c70e
|
匿评结束后提交的作品也应计算缺评扣分
|
2016-12-06 16:13:04 +08:00 |
|
cxt
|
5a6e64beb2
|
Revert "测验头部和新建题目的改版"
This reverts commit c33bf1b163.
Conflicts:
public/stylesheets/css/courses.css
|
2016-12-06 15:02:32 +08:00 |
|
cxt
|
098d42cbd1
|
更改作业的截止日期时也应重新判断作品是否迟交、作业id为4198的作品数据迁移
|
2016-12-06 14:47:17 +08:00 |
|
cxt
|
5bbe9e71ba
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into sx_cxt
Conflicts:
db/schema.rb
|
2016-12-06 14:12:40 +08:00 |
|
daiao
|
35fdf9a8a7
|
个人首页头部及其左侧导航(未完)
|
2016-12-06 09:36:13 +08:00 |
|
guange
|
dcfb9d589e
|
微信关注提示语优化
|
2016-12-05 16:27:25 +08:00 |
|
huang
|
66066e6899
|
commit导出方法及显示页面
|
2016-12-05 14:52:46 +08:00 |
|
huang
|
6ebaa1c90a
|
Merge branch 'develop' into dev_newproject
|
2016-12-05 11:12:52 +08:00 |
|
huang
|
5bc4c779ea
|
issue和commit_id关联
|
2016-12-05 11:07:41 +08:00 |
|
guange
|
d351827ba2
|
at功能实现
|
2016-12-04 19:20:02 +08:00 |
|
黄井泉
|
73dcd5256f
|
Merge branch 'develop' into 'develop'
pull request总数获取方式修改，列表页面添加相应的分页
See merge request !46
|
2016-12-02 20:09:18 +08:00 |
|
huang
|
7baa5be7ee
|
pull request总数获取方式修改，列表页面添加相应的分页
|
2016-12-02 20:00:15 +08:00 |
|
陈晓婷
|
54a7965a3e
|
Merge branch 'cxt_course' into 'develop'
作业的bug修复
See merge request !42
|
2016-12-02 17:48:45 +08:00 |
|
cxt
|
28444e0af7
|
“未评分”改为“无评分”， 评分设置的缺评扣分
|
2016-12-02 17:46:31 +08:00 |
|
陈晓婷
|
dd0c202f8c
|
Merge branch 'cxt_course' into 'develop'
匿评时其他人的评语不可见
See merge request !41
|
2016-12-02 17:09:34 +08:00 |
|
cxt
|
56b6d43862
|
匿评时其他人的评分不可见
|
2016-12-02 17:08:09 +08:00 |
|
daiao
|
ffce6f074f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-02 16:19:42 +08:00 |
|
daiao
|
b48fc7ba3b
|
pullrequest发送消息
|
2016-12-02 16:18:31 +08:00 |
|
黄井泉
|
42775a82f9
|
Merge branch 'cxt_course' into 'develop'
班级作业增加设置选项：成绩公开范围
See merge request !37
|
2016-12-02 14:53:55 +08:00 |
|
cxt
|
adac1d3d7a
|
班级问卷列表样式调整
|
2016-12-02 14:53:20 +08:00 |
|
黄井泉
|
ef86b6da2a
|
Merge branch 'develop' into 'develop'
项目提交动态的方法优化，及多个样式调整风格一致
See merge request !38
|
2016-12-02 14:47:25 +08:00 |
|
huang
|
4acb674d43
|
pull request 发送消息代码重构，封装
|
2016-12-02 14:42:52 +08:00 |
|
huang
|
2311731de4
|
Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-12-02 13:39:46 +08:00 |
|
黄井泉
|
9a83b81269
|
Merge branch 'develop' into 'develop'
项目没有数据的页面调整为新版；项目3类成员页面调整；组织列表新增新建功能；issue显示加长;
项目没有数据的页面调整为新版；项目3类成员页面调整；组织列表新增新建功能；issue显示加长;
See merge request !35
|
2016-12-02 13:36:25 +08:00 |