 yuanke
|
6cb711d66b
|
Merge branch 'develop' into yuanke_youhua
|
2016-11-21 10:14:08 +08:00 |
|
yuanke
|
14552abd56
|
博客人气排序修改，个人主页关注BUG修改
|
2016-11-21 10:08:27 +08:00 |
 cxt
|
cf6acd48c4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-18 19:17:47 +08:00 |
 huang
|
a58a3c0655
|
项目成员新弹框ajax局部刷新
|
2016-11-18 19:00:44 +08:00 |
|
cxt
|
4da94a5bb0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-11-18 17:32:55 +08:00 |
|
cxt
|
9a30369cef
|
班级作业：两种身份（助教和学生）的成员匿评扣分错误
|
2016-11-18 16:37:25 +08:00 |
|
huang
|
de61d699a8
|
Merge branch 'dev_newproject' into develop
|
2016-11-18 16:22:03 +08:00 |
|
huang
|
5f35e8bd97
|
修复新注册用户不能fork的问题
|
2016-11-18 16:20:18 +08:00 |
|
huang
|
6584cd88f1
|
pull request 使用优化
|
2016-11-18 16:08:50 +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 |
|
daiao
|
cd32353d91
|
Merge branch 'dai_ao' into develop
|
2016-11-18 15:45:35 +08:00 |
|
cxt
|
5510df165d
|
Merge branch 'cxt_course' into develop
Conflicts:
db/schema.rb
|
2016-11-18 15:45:06 +08:00 |
|
cxt
|
1fcb1db27c
|
课程大纲下的班级归档
|
2016-11-18 15:34:53 +08:00 |
|
huang
|
00d12fdeb3
|
pull reqeust相关
|
2016-11-17 17:30:15 +08:00 |
|
cxt
|
3ebc3c6492
|
老师、学生测验列表的调整
|
2016-11-17 17:04:00 +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 |
|
cxt
|
efd0bf6707
|
删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整
|
2016-11-17 10:23:13 +08:00 |
|
cxt
|
1ad0c1cbff
|
测验列表
|
2016-11-17 09:06:44 +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
|
2dc717df0c
|
Merge branch 'develop' into cxt_course
|
2016-11-15 16:57:33 +08:00 |
|
cxt
|
9f79408e32
|
导入试卷
|
2016-11-15 16:57:07 +08:00 |
|
huang
|
0adde560ba
|
我的issue路由修改及查询修改
|
2016-11-15 14:30:01 +08:00 |
|
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 |
|
cxt
|
d8906db1aa
|
班级学生列表：“未分班”列表对成员分班，成员显示未自动刷新；具体分班列表对成员编辑分班，分班成员数统计未自动刷新
|
2016-11-15 10:34:14 +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 |
|
cxt
|
0ed878e718
|
404、403、500页面
|
2016-11-14 15:36:36 +08:00 |
|
cxt
|
96bc35552a
|
未收藏的班级和项目动态不显示
|
2016-11-14 15:11:37 +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 |