 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 |
|
huang
|
2521e802bf
|
缺陷统计添加冒号
|
2015-04-21 14:48:49 +08:00 |
|
huang
|
b6f34045db
|
修改缺陷：缺陷上传附件后，第一条回复中会显示附件。
|
2015-04-21 14:40:12 +08:00 |
|
huang
|
5c2fdf7aee
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-21 14:20:13 +08:00 |
|
huang
|
dd25cdc065
|
1、修改项目三种类型术语
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
|
2015-04-21 14:19:50 +08:00 |
|
lizanle
|
457b86a861
|
版本配置
|
2015-04-21 10:14:46 +08:00 |
|
lizanle
|
2987253303
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-21 09:53:22 +08:00 |
|
lizanle
|
3b70ab964d
|
issue过滤
|
2015-04-21 09:53:09 +08:00 |
|
huang
|
4cddb214fd
|
修改资源库站内搜索不能搜索的bug
|
2015-04-21 09:49:10 +08:00 |
|
huang
|
3bd4f2d0f6
|
修改资源库样式
|
2015-04-20 17:55:07 +08:00 |
|
huang
|
692500af2e
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-20 14:54:27 +08:00 |
|
huang
|
93e3247685
|
项目名称不能为空提示
|
2015-04-20 14:54:04 +08:00 |
|
whimlex
|
86ef3e680a
|
项目简介展开更多信息不超过一定内容不显示
|
2015-04-20 14:45:46 +08:00 |
|
huang
|
8dd0e985a0
|
完成
|
2015-04-20 10:48:36 +08:00 |
|
whimlex
|
05712c4c06
|
学生作业改为作品
|
2015-04-17 17:48:25 +08:00 |
|
sw
|
90d541c066
|
Merge branch 'szzh' into develop
|
2015-04-17 17:10:11 +08:00 |
|
whimlex
|
11d83a863a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/projects/show.html.erb
|
2015-04-17 17:08:21 +08:00 |
|
whimlex
|
ab39d54b45
|
版本库文件列表样式
|
2015-04-17 17:07:23 +08:00 |
|
sw
|
6df1f55ac4
|
添加课程成员后不自动刷新
|
2015-04-17 16:53:04 +08:00 |
|
sw
|
d5e71e9803
|
增加课程成员收索功能后、添加课程成员，成员列表不自动刷新
|
2015-04-17 16:38:25 +08:00 |
|
huang
|
7340ef793c
|
修改新建项目的显示样式
|
2015-04-17 16:26:05 +08:00 |
|
whimlex
|
65e6b41d91
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 16:06:40 +08:00 |
|
whimlex
|
22a4bf9216
|
查看修订样式
|
2015-04-17 16:06:24 +08:00 |
|
huang
|
7d87915413
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/homework_attach/_homework.html.erb
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-04-17 15:07:01 +08:00 |
|
whimlex
|
92bf340786
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 14:51:27 +08:00 |
|
whimlex
|
af28461cf0
|
动态中创建项目样式调整
|
2015-04-17 14:51:10 +08:00 |
|
lizanle
|
17838acddb
|
提示信息数组 flatten
|
2015-04-17 14:39:30 +08:00 |
|
lizanle
|
5d627bf6f2
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-17 14:35:02 +08:00 |