 黄井泉
|
42775a82f9
|
Merge branch 'cxt_course' into 'develop'
班级作业增加设置选项：成绩公开范围
See merge request !37
|
2016-12-02 14:53:55 +08:00 |
 cxt
|
2fd4cb9064
|
班级作业增加设置选项：成绩公开范围
|
2016-12-02 13:30:49 +08:00 |
 daiao
|
77f252b538
|
Merge branch 'develop' into dai_ao
Conflicts:
app/controllers/pull_requests_controller.rb
app/views/users/_user_message_course.html.erb
app/views/users/_user_message_forge.html.erb
|
2016-12-02 13:26:41 +08:00 |
|
陈晓婷
|
39258f4ac5
|
Merge branch 'develop' into 'develop'
课程相关bug修复；叠层回复的“回复”、“赞”的显隐
See merge request !32
|
2016-12-02 10:14:07 +08:00 |
|
daiao
|
2e5cd96bb9
|
pullrequest发送消息
|
2016-12-01 11:31:48 +08:00 |
|
huang
|
dbc8c5811a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
app/controllers/pull_requests_controller.rb
|
2016-11-30 09:55:45 +08:00 |
|
daiao
|
2cee4448ea
|
pullrequest消息通知（未完）
|
2016-11-29 18:19:29 +08:00 |
|
daiao
|
b2de81394e
|
项目PullRequest列表，显示创建者的名字
|
2016-11-29 14:44:28 +08:00 |
|
cxt
|
3f35b7f806
|
贴吧回复改版
|
2016-11-29 09:36:38 +08:00 |
|
huang
|
42e301659e
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-28 09:24:29 +08:00 |
|
huang
|
ecf5101ef2
|
pull request 列表增加源项目/姓名 目标项目/姓名
|
2016-11-25 20:34:59 +08:00 |
|
cxt
|
e202a7b99c
|
二级回复
|
2016-11-25 20:13:01 +08:00 |
|
cxt
|
c965f72ce3
|
还原回复的隐藏
|
2016-11-25 19:19:38 +08:00 |
|
huang
|
872d8295e8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-25 17:51:30 +08:00 |
|
huang
|
9c12e774d1
|
pull request 文件内容正则修改
|
2016-11-25 17:50:37 +08:00 |
|
daiao
|
f1b6e67e50
|
项目头部样式修改，fork数目错误
|
2016-11-25 17:10:49 +08:00 |
|
cxt
|
785f027a63
|
Merge branch 'cxt_course' into develop
|
2016-11-25 14:56:24 +08:00 |
|
daiao
|
599d233176
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dai_ao
|
2016-11-25 10:49:57 +08:00 |
|
cxt
|
8743460134
|
动态与详情的回复叠层调整
|
2016-11-25 09:59:03 +08:00 |
|
huang
|
30a0347cd6
|
项目头部修改，及其成员列表，关注列表新版样式（未完）
|
2016-11-24 17:40:33 +08:00 |
|
daiao
|
f7db47be41
|
Merge branch 'dai_ao' into develop
|
2016-11-24 10:45:43 +08:00 |
|
huang
|
67a9d04a64
|
版本库添加删除功能
|
2016-11-23 17:14:49 +08:00 |
|
daiao
|
85f9f636a2
|
修复：里程碑关闭，编辑issue，里程碑被清空的情况
|
2016-11-22 16:51:16 +08:00 |
|
daiao
|
196d3b31a1
|
为完 切换分支
|
2016-11-22 14:29:03 +08:00 |
|
daiao
|
e585687e9c
|
铃铛消息，将登录名改为用户姓名，并将部分没有链接的加链接
|
2016-11-21 16:30:37 +08:00 |
|
daiao
|
609d1d2fb4
|
新建和编辑issue时，里程碑被清空的bug
|
2016-11-18 21:19:34 +08:00 |
|
cxt
|
003c6a7551
|
新建作业初始显示调整
|
2016-11-18 18:37:41 +08:00 |
|
huang
|
de61d699a8
|
Merge branch 'dev_newproject' into develop
|
2016-11-18 16:22:03 +08:00 |
|
daiao
|
290a301cee
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/css/common.css
|
2016-11-18 15:48:40 +08:00 |
|
cxt
|
db71b1578b
|
新建作业的时候，必须先选择作业类型
|
2016-11-18 10:43:49 +08:00 |
|
huang
|
f87d1ce3bd
|
ISSUE中指派者按中文姓名排序
|
2016-11-18 10:04:02 +08:00 |
|
daiao
|
d65a062737
|
所有我的issue功能
|
2016-11-17 17:02:02 +08:00 |
|
huang
|
386b41d08e
|
pull requst优化
|
2016-11-17 11:32:39 +08:00 |
|
daiao
|
e956d20d6e
|
我的issue部分功能
|
2016-11-16 16:57:02 +08:00 |
|
daiao
|
acffe8ec19
|
我的issue未完
|
2016-11-16 11:26:17 +08:00 |
|
cxt
|
acfbe6f03e
|
某用户为某班级的助教和学生两种角色成员，当前身份是助教，点击个人主页“我的作业”，如图对应的班级作品显示的却是“提交作品”-》 “查看作品”
|
2016-11-11 18:12:22 +08:00 |
|
huang
|
f71a21155f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 16:54:47 +08:00 |
|
huang
|
a655e73c50
|
配置中成员链接改成登录名
|
2016-11-11 16:54:24 +08:00 |
|
cxt
|
cb5ca96bb5
|
Merge branch 'cxt_course' into develop
Conflicts:
app/views/users/_course_homework.html.erb
db/schema.rb
|
2016-11-11 16:53:20 +08:00 |
|
daiao
|
812c74134a
|
Merge branch 'develop' into dev_newproject
|
2016-11-11 14:55:29 +08:00 |
|
daiao
|
5742a9951e
|
项目-配置-成员，翻页时，当前页用蓝色颜色标识
|
2016-11-11 13:44:39 +08:00 |
|
huang
|
aab24ea34a
|
解决顶部fork路由错误，已经fork过该项目的添加提示
|
2016-11-11 10:37:20 +08:00 |
|
cxt
|
0d8d2fbc90
|
班级活跃度排行去除老师和教辅
|
2016-11-11 09:29:29 +08:00 |
|
cxt
|
1e0c2e5d6a
|
班级首页的活跃度和英雄榜由3个增加到6个
|
2016-11-10 17:28:14 +08:00 |
|
huang
|
0f328c9c58
|
解决用户ID转换成用户名后引发的问题
|
2016-11-10 10:27:57 +08:00 |
|
cxt
|
070e18a9b2
|
作业动态优化
|
2016-11-08 15:39:00 +08:00 |
|
cxt
|
70a6a26819
|
班级作业：分组作业，开启了匿评后，某组再加了某组员，如图该组员看到的作业列表中不应该是“作品匿评”
|
2016-11-07 14:38:10 +08:00 |
|
cxt
|
78ca68b5e3
|
Merge branch 'cxt_course' into develop
Conflicts:
public/stylesheets/css/moduel.css
public/stylesheets/css/public.css
|
2016-11-04 16:15:56 +08:00 |
|
cxt
|
d762c68f7b
|
分组作业的页面显示和评分处理调整
|
2016-11-04 16:10:13 +08:00 |
|
cxt
|
6f1c648770
|
班级作业：修改评分后，同一人的之前的评分，就不显示了
|
2016-11-04 11:27:15 +08:00 |