 sw
|
f6dd7ff652
|
Merge branch 'guange_dev' into szzh
|
2015-04-22 14:54:17 +08:00 |
|
sw
|
de192761b8
|
Merge branch 'szzh' into guange_dev
Conflicts:
Gemfile
config/application.rb
|
2015-04-22 14:53:40 +08:00 |
whimlex
|
86bd708c5d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-22 14:35:25 +08:00 |
|
whimlex
|
21f08830df
|
意见反馈功能修改
|
2015-04-22 14:35:04 +08:00 |
|
sw
|
282581cc22
|
Merge branch 'dev_hjq' into szzh
|
2015-04-22 14:17:14 +08:00 |
|
sw
|
1cced5d7e6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-22 14:16:48 +08:00 |
|
sw
|
2f2d4257c2
|
调整提交作业按钮样式
|
2015-04-22 14:10:45 +08:00 |
 huang
|
9cfcbc5584
|
项目讨论区--未登录情况下提示界面
|
2015-04-22 13:56:36 +08:00 |
|
huang
|
bce1006969
|
邀请界面添加权限控制
|
2015-04-22 13:46:35 +08:00 |
|
huang
|
eeaa613c9e
|
项目类型实时刷新功能
|
2015-04-22 13:34:57 +08:00 |
 guange
|
336dba414e
|
缓存修改为redis存储
|
2015-04-22 13:01:33 +08:00 |
|
huang
|
154ee9f38b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-22 12:43:35 +08:00 |
|
huang
|
2f021aecee
|
项目成员列表添加角色。用户得分
|
2015-04-22 12:43:20 +08:00 |
|
guange
|
d2dd77612b
|
将登录默认值改为自动登录
|
2015-04-22 12:42:22 +08:00 |
|
sw
|
92eabdbecd
|
修改作业历史数据的问题
|
2015-04-22 11:49:48 +08:00 |
|
sw
|
09c51d1a87
|
修改创建作业未启用匿评时，所有作业列表看不到
|
2015-04-22 11:44:52 +08:00 |
|
sw
|
83796bfaa0
|
去掉puts
|
2015-04-22 11:18:22 +08:00 |
|
sw
|
d279881daf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/courses/settings.html.erb
|
2015-04-22 11:14:12 +08:00 |
|
sw
|
7b3edb59b0
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
public/javascripts/course.js
|
2015-04-22 11:11:51 +08:00 |
|
sw
|
287216ab31
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-22 11:08:23 +08:00 |
|
sw
|
3d8ec17bb1
|
修改学生作业得分列表弹出框样式
|
2015-04-22 11:07:39 +08:00 |
|
huang
|
49f33dd50c
|
类型bug修复
|
2015-04-22 10:50:12 +08:00 |
 lizanle
|
0de5ddd14c
|
题型用户上传百度云
|
2015-04-22 10:33:09 +08:00 |
|
huang
|
249c02efff
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-22 10:24:43 +08:00 |
|
huang
|
be5c7ac6dd
|
修改项目类型术语
图标
|
2015-04-22 10:24:15 +08:00 |
|
whimlex
|
0f037e78fa
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
public/stylesheets/public.css
|
2015-04-22 10:18:49 +08:00 |
|
whimlex
|
5123ca1047
|
版本库样式调整
|
2015-04-22 10:16:14 +08:00 |
|
huang
|
ee4cfb9c89
|
修改流程碑点进去样式
|
2015-04-22 09:59:29 +08:00 |
|
sw
|
5385f35aff
|
教师列表删除翻页
|
2015-04-22 09:52:12 +08:00 |
|
huang
|
ca26b0d819
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
app/views/users/show.html.erb
public/javascripts/course.js
|
2015-04-22 09:31:13 +08:00 |
|
huang
|
729d11ebaf
|
修复项目配置中首页显示问题
|
2015-04-22 09:22:52 +08:00 |
|
huang
|
8b77079f44
|
公开。私有标识强制不换行
|
2015-04-22 00:55:40 +08:00 |
|
sw
|
57193b077e
|
作品列表取消分页显示
|
2015-04-21 20:44:27 +08:00 |
|
huang
|
7c91a40e4f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-21 18:05:51 +08:00 |
|
huang
|
1fe35fc063
|
配置中添加角色权限判断
不同角色通过admin配置显示不同模块
|
2015-04-21 18:05:35 +08:00 |
|
whimlex
|
51aeb40d31
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-21 18:05:20 +08:00 |
|
whimlex
|
6441d298a2
|
版本库修订SVG图样式修改
|
2015-04-21 18:04:57 +08:00 |
|
whimlex
|
9fa3d25e3f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-21 17:57:39 +08:00 |
|
whimlex
|
b99f8d8056
|
上传头像，上传课程项目logo提示
|
2015-04-21 17:56:01 +08:00 |
|
lizanle
|
d6527f1f7e
|
去掉学生列表分页
|
2015-04-21 17:54:49 +08:00 |
|
lizanle
|
da7528c780
|
重定向到项目配置里的新建版本页面
|
2015-04-21 17:10:07 +08:00 |
|
whimlex
|
0d26f64afd
|
搜索课程——授课时间”与“课程简介”显示异常
|
2015-04-21 16:49:13 +08:00 |
|
huang
|
2043b963c8
|
添加意见反馈
项目配置权限
|
2015-04-21 16:35:51 +08:00 |
|
whimlex
|
ab93d19b56
|
动态中显示更新项目缺陷样式异常
|
2015-04-21 16:17:51 +08:00 |
|
huang
|
861469e39f
|
1、修改回复帖子和新建帖子标题冲突
2、对齐新建框
3、版本库新建按钮样式
|
2015-04-21 16:11:25 +08:00 |
|
huang
|
86027e077f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-21 15:22:43 +08:00 |
|
huang
|
5bfef259de
|
去掉缺陷列表空白处的链接
|
2015-04-21 15:22:27 +08:00 |
|
whimlex
|
84d7e63d54
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-21 15:11:15 +08:00 |
|
whimlex
|
6195f0a150
|
课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断
|
2015-04-21 15:10:45 +08:00 |
|
huang
|
c510f14edb
|
流程碑添加新建版本
|
2015-04-21 15:10:05 +08:00 |