whimlex
|
520627f010
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-24 17:11:55 +08:00 |
whimlex
|
cde4a892e0
|
竞赛主页竞赛通知条数对主页样式的调整
|
2015-04-24 17:11:36 +08:00 |
guange
|
e3dd68ad24
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-04-24 15:21:18 +08:00 |
guange
|
449bbc553c
|
修复issue界面js报错
|
2015-04-24 15:20:47 +08:00 |
whimlex
|
481f7ee4ba
|
意见反馈按回退键重新计算
|
2015-04-24 15:08:09 +08:00 |
whimlex
|
091c6125d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-24 15:02:53 +08:00 |
whimlex
|
85e1262769
|
意见反馈
|
2015-04-24 15:02:32 +08:00 |
sw
|
91e37c7ab8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-24 14:58:51 +08:00 |
whimlex
|
650ffd4397
|
课程和项目意见反馈
|
2015-04-24 14:47:50 +08:00 |
sw
|
f67bdae22a
|
课程讨论去引用、回帖不换行
|
2015-04-24 09:10:15 +08:00 |
whimlex
|
b61d76d94e
|
意见反馈
|
2015-04-23 18:18:07 +08:00 |
whimlex
|
e61822d74a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 17:56:11 +08:00 |
whimlex
|
b3e0490b90
|
意见反馈
|
2015-04-23 17:55:48 +08:00 |
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
2015-04-23 17:43:10 +08:00 |
guange
|
5c0d0230fc
|
去掉首页底部留白和不对齐
|
2015-04-23 17:43:10 +08:00 |
sw
|
b6652ed5e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 17:32:56 +08:00 |
sw
|
10bc470dcf
|
修改课程讨论区
|
2015-04-23 17:32:37 +08:00 |
huang
|
e38639665b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 17:02:42 +08:00 |
huang
|
7e7ff92f7c
|
issueenter键不能搜索的问题
|
2015-04-23 17:02:26 +08:00 |
huang
|
4c1259ff92
|
缺陷enter键盘不能搜索(未完成)
|
2015-04-23 16:56:18 +08:00 |
sw
|
4224e11b52
|
课程讨论区标题换行
|
2015-04-23 16:34:09 +08:00 |
sw
|
66057b5b4f
|
编辑帖子时的样式
|
2015-04-23 16:19:23 +08:00 |
whimlex
|
b5781ac22b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 16:13:19 +08:00 |
whimlex
|
5d0d9de6e8
|
意见反馈各主页内保持一致
|
2015-04-23 16:13:01 +08:00 |
huang
|
6a19ac4098
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 16:02:35 +08:00 |
huang
|
4da77d8a71
|
wiki页面显示
|
2015-04-23 16:02:18 +08:00 |
sw
|
12e65ad61f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 15:45:38 +08:00 |
huang
|
c9bfe00a4f
|
修改成员列表的排列
版本库页面色系
|
2015-04-23 15:31:14 +08:00 |
sw
|
75504139c9
|
删除课程留言时留言数自动刷新
|
2015-04-23 15:25:04 +08:00 |
sw
|
cfe0635804
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 14:31:01 +08:00 |
huang
|
de23c3c2a8
|
配置中子页面调整
隔行换色显示
显示页面左对齐
|
2015-04-23 14:04:22 +08:00 |
sw
|
b1e31ded0e
|
修改公共贴吧样式
|
2015-04-23 11:56:59 +08:00 |
sw
|
7cd54f07cb
|
我要反馈按钮移位
|
2015-04-23 11:50:16 +08:00 |
sw
|
6d058940ec
|
当课程没有讨论区时自动创建其讨论区
|
2015-04-23 11:44:07 +08:00 |
sw
|
5b5423b8c5
|
修改贴吧新建帖子、回复显示样式的问题
|
2015-04-23 10:47:54 +08:00 |
huang
|
ee1c53bacc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 10:20:15 +08:00 |
whimlex
|
2070d69d44
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 10:20:01 +08:00 |
huang
|
348eae5c45
|
修改项目模式提示样式
版本库
版本
|
2015-04-23 10:19:59 +08:00 |
whimlex
|
19fe973b5b
|
上传头像
|
2015-04-23 10:19:43 +08:00 |
whimlex
|
d66af82478
|
新建竞赛页面日历插件显示错误
|
2015-04-23 01:00:17 +08:00 |
huang
|
0484692b47
|
缺陷显示页面虚线多余
|
2015-04-22 17:57:36 +08:00 |
sw
|
9a07989917
|
调整header的login的样式
|
2015-04-22 17:01:36 +08:00 |
huang
|
425f8473b4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-22 16:49:23 +08:00 |
huang
|
681546b860
|
缺陷上传附件显示
项目邮件邀(未完成,需切换分支)
|
2015-04-22 16:49:07 +08:00 |
sw
|
1985d1c84b
|
调整header下啦列表框位置
|
2015-04-22 16:47:13 +08:00 |
sw
|
427f26b058
|
header的login显示
|
2015-04-22 16:37:24 +08:00 |
whimlex
|
36f2643ad8
|
上传logo
|
2015-04-22 16:33:12 +08:00 |
whimlex
|
7ec060cc46
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-22 15:49:56 +08:00 |
whimlex
|
4cb22f2437
|
课程、项目、个人头像上传
|
2015-04-22 15:49:38 +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
|
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 |
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
|
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
|
3d8ec17bb1
|
修改学生作业得分列表弹出框样式
|
2015-04-22 11:07:39 +08:00 |
huang
|
49f33dd50c
|
类型bug修复
|
2015-04-22 10:50:12 +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
|
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 |
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
|
5bfef259de
|
去掉缺陷列表空白处的链接
|
2015-04-21 15:22:27 +08:00 |
huang
|
c510f14edb
|
流程碑添加新建版本
|
2015-04-21 15:10:05 +08:00 |
huang
|
2521e802bf
|
缺陷统计添加冒号
|
2015-04-21 14:48:49 +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
|
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 |
whimlex
|
ab39d54b45
|
版本库文件列表样式
|
2015-04-17 17:07:23 +08:00 |