 cxt
|
95595c6fe6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2017-03-03 15:37:55 +08:00 |
|
cxt
|
6e1df8fd26
|
用户反馈（问吧）-编辑作业的bug
|
2017-03-03 15:09:00 +08:00 |
|
cxt
|
96312c6dfa
|
Merge branch 'cxt_course' into develop
|
2017-03-03 14:45:30 +08:00 |
|
cxt
|
4688fbaec9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-03-03 14:45:17 +08:00 |
|
cxt
|
f30507b6f0
|
在线测验改版
|
2017-03-03 14:43:51 +08:00 |
 daiao
|
90f0dc47b8
|
超级管理员的待审批申请中，更改申请高校名称后，依然在待审批消息中显示
|
2017-03-03 11:13:00 +08:00 |
|
daiao
|
83e4a44062
|
我发布的Issue更换新HTML
|
2017-03-02 15:09:33 +08:00 |
|
daiao
|
d75cf47079
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-03-02 13:44:46 +08:00 |
|
daiao
|
138a342613
|
首页左侧导航栏的底部地区为空时，不显示
|
2017-03-02 13:41:17 +08:00 |
|
daiao
|
aa1d2854b0
|
项目动态回复栏展开更多后，无回复框
|
2017-03-02 11:07:55 +08:00 |
|
daiao
|
c84383b357
|
导航栏搜索页面样式调整
|
2017-03-02 10:38:32 +08:00 |
|
daiao
|
bf379ff716
|
项目的PullRequest的样式有问题
|
2017-03-02 10:23:55 +08:00 |
|
daiao
|
abcaf33a17
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-03-02 09:45:45 +08:00 |
|
daiao
|
212fbc4e27
|
顶部导航搜索的项目，显示不正常
|
2017-03-02 09:42:35 +08:00 |
 huang
|
3582f70a6b
|
局部刷新测试
|
2017-03-01 16:53:01 +08:00 |
|
daiao
|
20cc376246
|
注册激活页面的更换邮箱，更换一次之后，第二次弹框显示的原邮箱不正确
|
2017-03-01 15:51:12 +08:00 |
|
daiao
|
3430620f10
|
我发布的issue中，状态居中对齐
|
2017-03-01 13:49:21 +08:00 |
|
daiao
|
f15d00f0bd
|
新建项目如果描述为空的时候显示怪异
|
2017-03-01 09:40:20 +08:00 |
|
huang
|
cfd2161756
|
改动sleep时间
|
2017-02-28 21:11:14 +08:00 |
|
huang
|
7804ea69bd
|
项目动态ajax刷新
|
2017-02-28 20:50:40 +08:00 |
|
huang
|
be1b507354
|
ajax刷新
|
2017-02-28 17:22:00 +08:00 |
|
daiao
|
7fbfeef8f3
|
首页显示的个人信息区域需要更新显示
|
2017-02-28 15:24:28 +08:00 |
|
cxt
|
baabce13b2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
public/stylesheets/css/common.css
public/stylesheets/css/courses.css
|
2017-02-28 10:15:33 +08:00 |
|
cxt
|
b4e7bff6ce
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-28 10:13:09 +08:00 |
|
cxt
|
524dd85409
|
班级新建作业，加入题库时，没有将附件一起加入
|
2017-02-28 10:11:58 +08:00 |
|
daiao
|
dda9858e21
|
注册激活页的留言，请更新留言的标题
|
2017-02-28 09:53:36 +08:00 |
|
cxt
|
e28d635630
|
竞赛作品评分设置的问题
|
2017-02-27 17:17:29 +08:00 |
 Linda
|
ec6206d9d8
|
我的缺陷列表样式重写，需要重新加入后台元素
|
2017-02-27 17:00:43 +08:00 |
|
cxt
|
0544cd2746
|
从题库发送的题，与从题库选用的题，不应该再有“加入题库”选项
|
2017-02-27 15:44:11 +08:00 |
|
Linda
|
e508477e7f
|
个人资料修改提示信息样式修改
项目资源库上传按钮样式修改
|
2017-02-27 14:18:02 +08:00 |
|
cxt
|
dd1badcdc0
|
学生列表中如图点击查看学生的作业得分，鼠标在如图处本想拖动弹框，该弹框却关闭了，作业得分和社区得分的弹框改版
|
2017-02-27 11:13:23 +08:00 |
|
cxt
|
5f7fbf7362
|
新建作业时，如图弹出时间设置弹框，此时再将鼠标光标放在作业描述输入框中，建议时间弹框自动关闭
|
2017-02-27 10:22:38 +08:00 |
|
huang
|
f459609c81
|
解决实训任务验证问题 用户名后添加导师
|
2017-02-25 11:08:37 +08:00 |
|
huang
|
5be7e048cf
|
没登陆情况不允许开启任务
|
2017-02-24 21:21:48 +08:00 |
|
huang
|
3abd2d4be6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-24 20:44:24 +08:00 |
|
cxt
|
1c7bbbf88d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-24 20:40:25 +08:00 |
|
cxt
|
03b7f91ed8
|
班级作业：如图分组作品“作品最终评分”显示的是扣分前的分，普通作业显示的却是扣分后的分，建议统一
|
2017-02-24 20:28:23 +08:00 |
|
daiao
|
a50ddd201c
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-24 20:15:03 +08:00 |
|
daiao
|
2aabaca9b6
|
实训项目序号只能输入数字或复制数字
|
2017-02-24 20:14:20 +08:00 |
|
cxt
|
b3a62f7325
|
班级作业：如图分组作品“作品最终评分”显示的是扣分前的分，普通作业显示的却是扣分后的分，建议统一
|
2017-02-24 20:09:51 +08:00 |
|
cxt
|
6d3ab4f651
|
竞赛通知和班级通知不能回复
|
2017-02-24 20:00:31 +08:00 |
|
huang
|
b510994365
|
竞赛添加访问统计
|
2017-02-24 19:42:23 +08:00 |
|
cxt
|
ca706f3df5
|
从题库选用作业：编程作业变成普通作业时，编程相关的属性设置还存在
|
2017-02-24 19:11:29 +08:00 |
|
huang
|
821dbe0ac2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-24 18:59:54 +08:00 |
|
cxt
|
73f64e80a8
|
班级作业：新建作业时“从题库选用”编程作业，如图报500
|
2017-02-24 18:32:09 +08:00 |
|
huang
|
374323eb32
|
已经实训过的跳转问题
|
2017-02-24 17:43:43 +08:00 |
|
daiao
|
e3d0551e51
|
合作伙伴的开源软件链接更为不可点击跳转
|
2017-02-24 16:35:48 +08:00 |
|
daiao
|
f4ea11c4c2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-24 16:20:38 +08:00 |
|
daiao
|
d05b3419d7
|
项目列表样式调整
|
2017-02-24 16:20:12 +08:00 |
|
陈晓婷
|
367dfbadee
|
Merge branch 'develop' into 'develop'
报500
See merge request !157
|
2017-02-24 16:18:23 +08:00 |