 huang
|
1e5d3e05ad
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-15 14:09:40 +08:00 |
|
huang
|
0ea9a49f86
|
质量分析界面调整
|
2016-11-15 14:09:25 +08:00 |
 daiao
|
c927a6fecc
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-15 13:21:37 +08:00 |
|
daiao
|
ffe86c7ec9
|
项目配置删除按钮新版弹框
|
2016-11-15 13:21:27 +08:00 |
|
huang
|
11f8656651
|
0
|
2016-11-15 11:20:30 +08:00 |
|
huang
|
5f21b63c41
|
我的issue框架搭建
|
2016-11-15 10:47:07 +08:00 |
|
huang
|
3561009efc
|
Merge branch 'develop' into dev_newproject
|
2016-11-15 09:01:45 +08:00 |
 cxt
|
edf8ceed7c
|
取消收藏的班级和项目动态不显示
|
2016-11-14 16:37:42 +08:00 |
|
huang
|
f08b04d645
|
My Issue未完
|
2016-11-14 16:06:54 +08:00 |
|
cxt
|
b06dcc9db4
|
780班级访问分班报500
|
2016-11-14 15:38:00 +08:00 |
|
huang
|
d1f9ce3ab2
|
课程中资源库导入不能用
|
2016-11-11 18:19:03 +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 |
|
cxt
|
16c51e1eaa
|
基于项目的分组作业没有显示项目详情
|
2016-11-11 16:50:25 +08:00 |
|
huang
|
442fb8a531
|
添加fork成员列表
|
2016-11-11 16:09:43 +08:00 |
|
cxt
|
d1bfdde261
|
班级名称命名和显示规范调整
|
2016-11-11 15:19:22 +08:00 |
|
daiao
|
812c74134a
|
Merge branch 'develop' into dev_newproject
|
2016-11-11 14:55:29 +08:00 |
|
cxt
|
07b97c8eb9
|
学生列表增加删除功能、删除学生时删除其对应的作品
|
2016-11-11 13:58:07 +08:00 |
|
huang
|
b633200ab6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-11 10:38:10 +08:00 |
|
huang
|
aab24ea34a
|
解决顶部fork路由错误，已经fork过该项目的添加提示
|
2016-11-11 10:37:20 +08:00 |
 yuanke
|
c59081c824
|
Merge branch 'yuanke_youhua' into develop
|
2016-11-11 10:24:22 +08:00 |
|
cxt
|
4a5e350615
|
个人主页：删除个人留言动态，却跳转到个人留言页面去了，不合理
|
2016-11-10 17:24:00 +08:00 |
|
daiao
|
43e72813b4
|
当指派着为空时，导出统计为空
|
2016-11-10 11:11:28 +08:00 |
|
yuanke
|
88d489b485
|
作业列表设留言at消息为已读改为delay_job执行
|
2016-11-10 10:41:35 +08:00 |
|
huang
|
3dcd38a059
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-10 10:31:40 +08:00 |
|
huang
|
0f328c9c58
|
解决用户ID转换成用户名后引发的问题
|
2016-11-10 10:27:57 +08:00 |
|
daiao
|
f6eb96cfdc
|
项目头部点击fork弹框
|
2016-11-09 13:34:03 +08:00 |
|
huang
|
2122a06608
|
版本库大写转小写，解决路径问题
|
2016-11-08 17:12:35 +08:00 |
|
daiao
|
27c8d53cad
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
|
2016-11-08 16:19:23 +08:00 |
|
daiao
|
ac60940c34
|
1.项目头部样式调整
|
2016-11-08 16:18:59 +08:00 |
|
huang
|
736c93fc13
|
解决查看文件改动的时候403问题
|
2016-11-08 15:45:32 +08:00 |
|
huang
|
c27faf862f
|
版本库单个文件历史记录修改
|
2016-11-08 15:30:16 +08:00 |
|
huang
|
b5f035d286
|
版本库详情页面添加目录回退功能，部分功能及界面调整
|
2016-11-08 15:21:12 +08:00 |
|
huang
|
a3dfd03e81
|
项目顶端框架搭建及权限判断
|
2016-11-08 10:23:02 +08:00 |
|
yuanke
|
4f7531b0c4
|
修改群号
|
2016-11-08 09:28:32 +08:00 |
|
huang
|
cceadb02ce
|
Merge branch 'develop' into dev_newproject
|
2016-11-07 17:19:47 +08:00 |
|
huang
|
0ef3dbf5f8
|
Merge branch 'develop' into dev_newproject
|
2016-11-07 17:18:36 +08:00 |
|
cxt
|
f8316ee1ee
|
分组作业的缺评扣分
|
2016-11-07 14:06:11 +08:00 |
|
daiao
|
e70c66b5ac
|
Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
app/views/projects/_act_issues.html.erb
|
2016-11-07 13:30:15 +08:00 |
|
daiao
|
8b5879217d
|
调整新建项目issue页面
|
2016-11-07 13:28:50 +08:00 |
|
cxt
|
4377fc1f9e
|
班级作业：评分设置中最终得分“教师优先”、“教辅优先”轮流切换多次后，得分计算错误
|
2016-11-04 20:04:27 +08:00 |
|
cxt
|
59a4514950
|
关闭匿评时出现比例大于100%的情况
|
2016-11-04 19:10:22 +08:00 |
|
cxt
|
f921c8cccc
|
发布作业时默认教师优先、迟交扣分为0、缺评扣分为0
|
2016-11-04 18:54:51 +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 |
|
cxt
|
20f112d5ad
|
作业评分设置的调整
|
2016-11-04 09:23:23 +08:00 |
|
huang
|
69bd89761d
|
解决编码问题
|
2016-11-03 16:19:04 +08:00 |
|
huang
|
21c6a0ad0d
|
导出所有用户13---all
|
2016-11-03 15:59:59 +08:00 |
|
huang
|
ef43488861
|
admin添加导出用户所有代码提交量
|
2016-11-03 15:35:09 +08:00 |
|
cxt
|
4575b8274e
|
不限定匿评人数
|
2016-11-03 10:25:53 +08:00 |