daiao
|
0b82b3e994
|
TPM实训index页面
|
2017-03-14 14:39:05 +08:00 |
huang
|
f086f5acd3
|
版本库封装
|
2017-03-14 14:38:14 +08:00 |
huang
|
38ff90a8bf
|
myshixun模板
|
2017-03-14 11:25:01 +08:00 |
huang
|
e3285eecc9
|
output 输出
|
2017-03-14 10:48:46 +08:00 |
huang
|
c069279105
|
myshixuns 版本库entry
|
2017-03-14 10:08:49 +08:00 |
huang
|
6ec7769c0e
|
Merge branch 'dev_bigdata' into dev_shixun_project
Conflicts:
app/controllers/account_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/_logined_header.html.erb
app/views/layouts/base_contest_community.html.erb
app/views/layouts/base_contests.html.erb
app/views/layouts/base_course_community.html.erb
app/views/layouts/base_courses.html.erb
app/views/layouts/base_project_community.html.erb
app/views/layouts/base_syllabus.html.erb
app/views/layouts/new_base.html.erb
app/views/layouts/new_base_user.html.erb
app/views/layouts/new_base_user_show.html.erb
public/stylesheets/css/structure.css
|
2017-03-14 09:30:02 +08:00 |
huang
|
63881869f6
|
game局部显示版本库路由及相关action
|
2017-03-13 17:39:27 +08:00 |
huang
|
8bbee334c3
|
实训开启显示权限控制
|
2017-03-13 15:18:53 +08:00 |
huang
|
90efe7cc35
|
tpm版本库目录功能
|
2017-03-13 14:55:18 +08:00 |
huang
|
47e87b115a
|
flash闪存处理
|
2017-03-13 14:37:39 +08:00 |
huang
|
0298c45b20
|
shixun模块版本库创建事务一致性处理
|
2017-03-13 14:12:34 +08:00 |
huang
|
fbc52a7892
|
games模块相关功能
|
2017-03-13 09:00:13 +08:00 |
huang
|
6183db782a
|
games模块开发
|
2017-03-10 15:41:44 +08:00 |
huang
|
6d182eca2c
|
shixun测试
|
2017-03-09 17:03:50 +08:00 |
huang
|
8526c409b5
|
build输出结果记录
|
2017-03-09 14:51:39 +08:00 |
huang
|
fc91dce7ba
|
实训任务build
|
2017-03-08 17:16:05 +08:00 |
huang
|
622b7a4979
|
TPI开启任务模块
|
2017-03-08 14:59:40 +08:00 |
huang
|
c1a8682ac2
|
job更新功能
|
2017-03-08 09:32:08 +08:00 |
huang
|
6fc4e971de
|
jenkins job创建
|
2017-03-08 09:16:38 +08:00 |
huang
|
3742757ae6
|
shixun job create
|
2017-03-07 18:19:50 +08:00 |
huang
|
4b825ecd22
|
challenge列表页面
|
2017-03-07 13:43:21 +08:00 |
huang
|
7faee25b3f
|
url链接
|
2017-03-07 09:36:56 +08:00 |
huang
|
dd31a55bdd
|
Merge branch 'develop' into dev_shixun_project
Conflicts:
db/schema.rb
|
2017-03-07 09:32:40 +08:00 |
huang
|
065cd95714
|
删除项目后依旧能fork项目功能
|
2017-03-07 09:25:51 +08:00 |
huang
|
956a078a36
|
challeng模块新建、create
|
2017-03-06 17:36:01 +08:00 |
huang
|
ca118e2bef
|
版本库分离
|
2017-03-06 14:56:34 +08:00 |
cxt
|
c6799aae67
|
Ucloud测试版:答题之后查看答题情况界面中,问答题区域多了一根分隔线
|
2017-03-03 19:00:43 +08:00 |
huang
|
8d54187e04
|
周五内容
|
2017-03-03 18:49:56 +08:00 |
cxt
|
1fb0160ae5
|
Ucloud测试版:点击发送的在线测试,页面显示500
|
2017-03-03 18:43:26 +08:00 |
cxt
|
181ccbf287
|
竞赛作品编辑时点击取消,返回的是错误页面
|
2017-03-03 16:25:13 +08:00 |
cxt
|
bf85e593a2
|
加入邀请码已停用的竞赛,提示信息内容错误
|
2017-03-03 16:17:02 +08:00 |
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 |
huang
|
c14840ef83
|
实训项目基础框架搭建及相关关联
|
2017-03-02 15:44:56 +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 |
cxt
|
544dfd356e
|
竞赛、课程、项目列表报500
|
2017-02-24 16:15:23 +08:00 |
黄井泉
|
af959a1260
|
Merge branch 'develop' into 'develop'
本周上线任务
See merge request !156
|
2017-02-24 15:35:17 +08:00 |
huang
|
c613e29299
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-24 15:33:51 +08:00 |
huang
|
bd0bd02084
|
权限控制
|
2017-02-24 15:33:15 +08:00 |
cxt
|
099fcde246
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/schema.rb
|
2017-02-24 15:20:34 +08:00 |
cxt
|
01484701d2
|
竞赛首页的简介下方直接显示竞赛动态
|
2017-02-24 15:14:09 +08:00 |
daiao
|
91017041ac
|
组织底部导航修改
|
2017-02-24 15:06:48 +08:00 |
daiao
|
a1fee68d8b
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-24 14:56:44 +08:00 |
daiao
|
47017f875a
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-24 14:52:06 +08:00 |
daiao
|
a8588a5670
|
课程样式调整
|
2017-02-24 14:51:44 +08:00 |
huang
|
2e81633308
|
TPM TPi权限控制
|
2017-02-24 14:46:29 +08:00 |
cxt
|
3e3ad381b1
|
竞赛:改了提交截止日期,显示的还是提交已截止
|
2017-02-24 14:29:41 +08:00 |
huang
|
6e96f6e9ec
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-24 13:52:18 +08:00 |
cxt
|
0e40bf6daf
|
题库改版
|
2017-02-24 10:32:48 +08:00 |
huang
|
6e9ef8ee12
|
Merge branch 'develop' into dev_raining
Conflicts:
app/controllers/repositories_controller.rb
app/views/layouts/_base_project_top.html.erb
|
2017-02-24 10:26:22 +08:00 |
huang
|
38e6b098c3
|
回复为0不显示
|
2017-02-24 10:01:08 +08:00 |
huang
|
bd2d0d3869
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
Conflicts:
app/views/training_tasks/_content_list.html.erb
|
2017-02-24 09:58:52 +08:00 |
daiao
|
c76db2cb24
|
项目问题动态回复功能修复
|
2017-02-24 09:56:58 +08:00 |
daiao
|
9e7ce0fd6a
|
实训任务样式调整
|
2017-02-24 09:41:15 +08:00 |
huang
|
658023cbe0
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-24 09:04:07 +08:00 |
daiao
|
4885ec5afb
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 17:26:35 +08:00 |
daiao
|
9697a9b5c1
|
实训项目展开/收起回复加载KE
|
2017-02-23 17:26:22 +08:00 |
huang
|
7074cbdba6
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 17:24:12 +08:00 |
huang
|
019ce762f8
|
针对实训子项目,一些权限修改
|
2017-02-23 17:23:52 +08:00 |
Linda
|
2fb75fdb4d
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 17:14:32 +08:00 |
Linda
|
b369b9c281
|
实训任务标题样式修改
|
2017-02-23 17:13:56 +08:00 |
daiao
|
75f1fc964a
|
实训任务项目动态展开更多与收起回复功能
|
2017-02-23 17:09:22 +08:00 |
huang
|
705f94428e
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 16:18:16 +08:00 |
huang
|
49f63992d8
|
任务开启的时候权限控制
|
2017-02-23 16:17:37 +08:00 |
daiao
|
f817aef5d2
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 16:13:16 +08:00 |
daiao
|
1e56a69eed
|
动态消息的实训动态添加回复/二级回复功能
|
2017-02-23 16:12:29 +08:00 |
Linda
|
95f06e50ff
|
实训任务动态标题样式修改
|
2017-02-23 16:01:23 +08:00 |
huang
|
6bd160d642
|
样式问题
|
2017-02-23 15:46:07 +08:00 |
huang
|
0e48262407
|
动态中提交评测ajax局部刷新
|
2017-02-23 15:27:10 +08:00 |
huang
|
727a6fd536
|
实训项目一些封装
|
2017-02-23 14:13:25 +08:00 |
huang
|
384ae2764a
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 10:45:50 +08:00 |
huang
|
9a3793ffa9
|
完成training_task 编辑功能
|
2017-02-23 10:45:28 +08:00 |
daiao
|
b36c249a6b
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 10:29:21 +08:00 |
Linda
|
e1be2fda81
|
实训任务提交测评显示状态增加样式
|
2017-02-23 10:25:55 +08:00 |
daiao
|
7e04e67a5b
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 10:10:59 +08:00 |
daiao
|
8bd9fc81d6
|
账号未激活提示页提交留言机制修改(从发送到管理员留言改到贴吧)
|
2017-02-23 10:09:56 +08:00 |
huang
|
04edefac8b
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 09:47:39 +08:00 |
huang
|
ac77c26c50
|
task写入项目动态中
|
2017-02-23 09:47:15 +08:00 |
daiao
|
8d51e896fa
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-23 09:32:36 +08:00 |
daiao
|
fa7b15db47
|
注册成功提示页与账号未激活提示页,增加‘更换邮箱的功能’
|
2017-02-23 09:32:13 +08:00 |
huang
|
b08a8e8050
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-22 15:52:05 +08:00 |
huang
|
eeba0c362d
|
实训项目一些ajax控制
|
2017-02-22 15:49:37 +08:00 |
huang
|
3f105cefe7
|
版本库访问权限控制清理
|
2017-02-22 12:33:45 +08:00 |
cxt
|
da4aaca1ea
|
消息首页报500
|
2017-02-22 12:26:56 +08:00 |
daiao
|
807129aeff
|
项目实训任务二级回复样式调整
|
2017-02-22 10:55:24 +08:00 |
黄井泉
|
7f7491c670
|
Merge branch 'develop' into 'develop'
部分项目切换分支500问题
See merge request !154
|
2017-02-22 10:46:42 +08:00 |
cxt
|
f41341a3d4
|
班级成员列表报500
|
2017-02-22 10:35:33 +08:00 |
huang
|
0629b31e53
|
解决部分项目(比如:594)切换版本库分支500问题
|
2017-02-22 10:14:04 +08:00 |
daiao
|
06306e0214
|
实训项目叠层回复功能
|
2017-02-22 10:08:05 +08:00 |
cxt
|
422b5ffa95
|
首页申请加入竞赛的消息报500
|
2017-02-22 10:01:54 +08:00 |
huang
|
0070bed92b
|
项目质量分析结果列表样式异常问题
|
2017-02-22 09:35:11 +08:00 |
huang
|
96aa9b7261
|
实训项目一些调整,api和结构
|
2017-02-22 08:54:38 +08:00 |
daiao
|
4a925201eb
|
实训任务增加二级回复功能
|
2017-02-21 17:23:44 +08:00 |
daiao
|
41197af763
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-21 16:24:58 +08:00 |
daiao
|
43c990c0a9
|
二级回复功能(回复未刷新)
|
2017-02-21 16:24:30 +08:00 |
Linda
|
81ac923e3b
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-21 14:57:49 +08:00 |
Linda
|
7451838509
|
syllablus.css和sy.public.css简化转移到 css文件夹;修改页面中引用这两个样式的路径
|
2017-02-21 14:51:48 +08:00 |
huang
|
e6deabadba
|
后台作业列表添加编程作业过滤
|
2017-02-21 14:45:18 +08:00 |
daiao
|
818d7ad2ef
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-21 14:38:32 +08:00 |
daiao
|
544432adce
|
实训任务详情页面的一级回复功能
|
2017-02-21 14:38:05 +08:00 |
huang
|
f7e59c782c
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-21 14:34:40 +08:00 |
huang
|
f59243ab9f
|
实训api改进及一些提醒
|
2017-02-21 14:34:17 +08:00 |
daiao
|
e4b582fbb7
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-20 15:19:44 +08:00 |
daiao
|
aacac21110
|
实训任务详情页面
|
2017-02-20 15:19:24 +08:00 |
huang
|
d21350b754
|
tpi先建任务权限判断
|
2017-02-20 14:39:39 +08:00 |
huang
|
32f14e957d
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-20 14:23:25 +08:00 |
huang
|
8063932500
|
fork项目的时候一并forkmodule
|
2017-02-20 14:23:02 +08:00 |
daiao
|
c115fad8a1
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
Conflicts:
db/schema.rb
|
2017-02-20 14:09:59 +08:00 |
daiao
|
8039f89d92
|
实训项目的列表页面
|
2017-02-20 14:08:48 +08:00 |
huang
|
336c28ccdb
|
实训项目权限控制
|
2017-02-20 12:33:27 +08:00 |
Linda
|
1fb79f717c
|
留言界面,留言与留言直接间隔修改
|
2017-02-20 11:27:18 +08:00 |
Linda
|
54eb9b0bca
|
网站底部版权信息居中
|
2017-02-20 10:48:36 +08:00 |
Linda
|
72f085e13e
|
Merge branch 'develop' into dev_raining
Conflicts:
db/migrate/20170219062646_add_positon_to_training_task.rb
db/schema.rb
|
2017-02-20 10:15:47 +08:00 |
huang
|
e5cfc7280b
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-19 17:50:17 +08:00 |
huang
|
8d1987567e
|
实训项目相关模块相关api的开发
|
2017-02-19 17:49:58 +08:00 |
Linda
|
dae19d7be6
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/projects/settings/_new_modules.html.erb
|
2017-02-19 15:30:38 +08:00 |
Linda
|
89dc320027
|
合作伙伴图片 及项目管理脚本录入界面
|
2017-02-19 15:28:57 +08:00 |
daiao
|
2aa025cf32
|
实训项目新建页面样式调整
|
2017-02-19 15:17:46 +08:00 |
daiao
|
0bce2f25b4
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
|
2017-02-19 14:40:48 +08:00 |
huang
|
82c6799953
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining
Conflicts:
db/schema.rb
|
2017-02-19 14:40:27 +08:00 |
huang
|
df66e6d60c
|
启动任务相关接口
|
2017-02-19 14:39:15 +08:00 |
daiao
|
568bc4e6b7
|
项目配置-模块页面加入提示
|
2017-02-19 11:24:43 +08:00 |
daiao
|
243062bee2
|
实训项目module中“实训项目”和"issue”不能同时选中,只选中一个
|
2017-02-19 10:50:08 +08:00 |
daiao
|
77f58d76a5
|
Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop
# Conflicts:
# db/schema.rb
|
2017-02-19 09:21:55 +08:00 |
cxt
|
c3cd2ea153
|
班级的编程作业在新建和编辑时,需要增加输入输出样例的录入入口
|
2017-02-18 18:00:52 +08:00 |
huang
|
a43c5cdb2f
|
启动实训Api等
|
2017-02-18 17:44:50 +08:00 |
cxt
|
9ef33daa39
|
学生列表各积分标题的tip请统一放在右侧提示区(参照班级邀请码tip)
|
2017-02-18 15:07:48 +08:00 |
cxt
|
9c3e7ab595
|
班级配置页面的底部留白不要太多
|
2017-02-18 14:14:54 +08:00 |
huang
|
d4eb4c0d56
|
实训任务模块
|
2017-02-17 19:29:00 +08:00 |
cxt
|
de7b29c260
|
从课程界面进入的新建班级页面,班级名称未自动添加上课程名称
|
2017-02-17 16:33:01 +08:00 |
cxt
|
c1301bbd7d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2017-02-17 15:02:24 +08:00 |
cxt
|
b81d9b86c4
|
班级的配置页面,管理员增加“更换管理员”功能
|
2017-02-17 15:00:14 +08:00 |
cxt
|
49c6b3be12
|
导入的在线测验,进入编辑页面,没有填写日期信息,也成功提交了
|
2017-02-17 10:32:27 +08:00 |
daiao
|
3cad78a991
|
增加合作伙伴的显示
|
2017-02-17 10:09:10 +08:00 |
cxt
|
aefd4973c2
|
在线测验的新建、编辑改版
|
2017-02-17 09:03:43 +08:00 |
daiao
|
2c42a51195
|
平台管理员的首页报500
|
2017-02-17 09:00:35 +08:00 |
daiao
|
0d1738cf91
|
我收到的issue,标题没有居中显示,有错位
|
2017-02-16 14:54:56 +08:00 |
daiao
|
9af54a9288
|
我发布的issue列表,标题没有居中对齐,视觉上有错位
|
2017-02-16 14:09:15 +08:00 |
cxt
|
c16f63a8b4
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
Conflicts:
db/schema.rb
public/stylesheets/css/courses.css
|
2017-02-15 11:15:09 +08:00 |
cxt
|
9be2cb56a1
|
Revert "Revert "测验头部和新建题目的改版""
This reverts commit 5a6e64beb2 .
Conflicts:
db/schema.rb
public/stylesheets/css/courses.css
|
2017-02-15 11:12:10 +08:00 |
cxt
|
11eba7637f
|
班级头部信息展示由三行更新成两行
|
2017-02-14 16:29:28 +08:00 |
cxt
|
10b7063791
|
新建班级选择课程后,在班级名称中自动带入课程名称,减少用户输入
|
2017-02-14 15:22:12 +08:00 |
cxt
|
89eab427aa
|
班级统计中的项目活跃度增加按作业过滤
|
2017-02-14 15:07:38 +08:00 |
daiao
|
bc0be4c890
|
项目社区首页的左侧导航栏,样式问题
|
2017-02-14 10:03:38 +08:00 |
daiao
|
603d5d5703
|
底部导航的版权限制中,空格太大
|
2017-02-14 09:59:06 +08:00 |
daiao
|
7c0042b70d
|
个人主页列表变成粗体了
|
2017-02-14 09:15:58 +08:00 |
cxt
|
649f87a43f
|
班级左侧导航栏的活跃度和英雄榜链接错误
|
2017-02-13 16:02:11 +08:00 |
cxt
|
4a04d1c271
|
作业,资源,问卷,在线测验模块没有数据显示时,显示笑脸图片
|
2017-02-13 15:58:33 +08:00 |
cxt
|
52834f4b21
|
作业评分设置弹框,如图弹框不能移动导致显示不全
|
2017-02-13 14:49:06 +08:00 |
cxt
|
8756bd7061
|
一个学生的匿评申诉被接受一次,但是违规匿评扣分却扣了两次、
匿评申诉被处理后,无论是申诉人还是被申诉人,都收到了2条一样的消息通知
|
2017-02-13 14:34:14 +08:00 |
daiao
|
6ea90fb74f
|
项目里程碑,pullrequest样式调整(tab下样式边窄了)
|
2017-02-13 13:54:13 +08:00 |
cxt
|
4930e36503
|
匿评申诉的弹框显示,标题位置错误
|
2017-02-13 11:00:33 +08:00 |
cxt
|
bd8e86b34b
|
未登录用户不可在班级留言
|
2017-02-10 17:23:07 +08:00 |