 caishi
|
c3860aa90d
|
Merge branch 'dev_cs' into develop
|
2017-08-04 19:26:13 +08:00 |
|
caishi
|
755214f92a
|
认证页面样式
issues修改
|
2017-08-04 19:25:12 +08:00 |
 cxt
|
be6788c931
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-04 19:22:35 +08:00 |
 daiao
|
304ccdfceb
|
html评测应该进入“测试结果”tab刷新等待显
|
2017-08-04 19:21:27 +08:00 |
|
cxt
|
f6c18c1a5e
|
试用申请的提示
|
2017-08-04 18:59:48 +08:00 |
|
cxt
|
3fd1183eae
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-04 18:46:10 +08:00 |
|
cxt
|
d1b2e4c63f
|
基本资料页关于实名认证和职业认证的调整
|
2017-08-04 18:45:57 +08:00 |
|
daiao
|
ff40ee71e9
|
创建实训
|
2017-08-04 17:31:02 +08:00 |
|
cxt
|
9d46f93e76
|
职业认证点击示例跳转到下载页面，无法打开
|
2017-08-04 17:29:59 +08:00 |
|
daiao
|
9982911e2c
|
实训新建了选择任务，模拟实战没有重置
|
2017-08-04 17:28:53 +08:00 |
|
cxt
|
11bb2e4d62
|
职业认证填写部门名称时样式有错乱
|
2017-08-04 17:21:24 +08:00 |
|
caishi
|
224309ae99
|
Merge branch 'develop' into dev_cs
|
2017-08-04 17:09:03 +08:00 |
|
caishi
|
fbb647166e
|
评论缩放文本框与按钮重叠
|
2017-08-04 17:08:30 +08:00 |
|
cxt
|
6910b267e4
|
超级管理员认证的状态位更新不对
|
2017-08-04 17:05:42 +08:00 |
|
daiao
|
491743800e
|
个人主页“添加关注”无反应
|
2017-08-04 17:01:19 +08:00 |
|
cxt
|
6aa1c379d6
|
实名认证通过后，不应该可以重新认证
|
2017-08-04 16:59:14 +08:00 |
|
cxt
|
ed037536f7
|
已经结束的实训作业也不应该有参考答案的显示
|
2017-08-04 16:47:03 +08:00 |
|
cxt
|
40f47b037c
|
作业相关页面的导航调整
|
2017-08-04 16:44:39 +08:00 |
|
caishi
|
e782ee738a
|
Merge branch 'dev_cs' into develop
Conflicts:
app/views/messages/_common_reply_box.html.erb
app/views/student_work/_common_reply_box.html.erb
|
2017-08-04 16:42:24 +08:00 |
|
caishi
|
2cc1727693
|
Issues修改
|
2017-08-04 16:39:12 +08:00 |
|
daiao
|
093640c5dc
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-04 16:38:08 +08:00 |
|
daiao
|
7c28f56cc1
|
TPI评测区域样式调整
|
2017-08-04 16:37:54 +08:00 |
|
cxt
|
e15716ca91
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-08-04 16:35:13 +08:00 |
|
cxt
|
323ef492fe
|
实名认证和职业认证的后台管理页面
|
2017-08-04 16:34:58 +08:00 |
|
daiao
|
ba60f9e694
|
实训TPI加入点赞与踩的数据统计
|
2017-08-04 16:10:42 +08:00 |
|
daiao
|
b4b214fa44
|
实训的技术平台将python拆分成2.7和3.6，但是实训首页的筛选条件中python没有拆分
|
2017-08-04 15:19:34 +08:00 |
|
daiao
|
2881942313
|
python语言分环境
|
2017-08-04 15:10:43 +08:00 |
|
daiao
|
53f5ae6945
|
选择题实训报错
|
2017-08-04 14:40:12 +08:00 |
|
daiao
|
a8891d3d4f
|
Merge branch 'dev_daiao' into develop
Conflicts:
public/stylesheets/css/edu-public.css
|
2017-08-04 14:11:26 +08:00 |
|
cxt
|
e76abad440
|
Merge branch 'dev_cxt' into develop
|
2017-08-04 13:59:52 +08:00 |
|
daiao
|
c22de54489
|
实训未发布只是进行模拟实战，答题正确后选择题不应该有经验值
|
2017-08-04 13:58:14 +08:00 |
|
cxt
|
c25b584898
|
实名认证和职业认证
|
2017-08-04 11:20:28 +08:00 |
|
daiao
|
bc2ec225b9
|
实训选择题回答正确后没有开启下一关但是时间还是跑
|
2017-08-04 11:10:10 +08:00 |
|
daiao
|
2d32a52114
|
全部实训的首页增加“已发布”标签
|
2017-08-04 11:08:07 +08:00 |
|
daiao
|
25f22ad8fd
|
Merge branch 'dev_cs' into dev_daiao
Conflicts:
app/helpers/application_helper.rb
|
2017-08-04 11:04:47 +08:00 |
|
daiao
|
7e350746d4
|
我的实训中我已创建显示的数据应该按照更新时间的降序来显示
|
2017-08-04 11:01:57 +08:00 |
|
daiao
|
d2cede6754
|
html实训
|
2017-08-04 10:19:41 +08:00 |
|
caishi
|
ff50a90e44
|
个人成长记录中心页面（还有金币图片）
班级动态点赞后“赞”的字会移到左边
样式修改
|
2017-08-04 09:52:13 +08:00 |
|
daiao
|
397e59e5d1
|
html实训
|
2017-08-04 09:38:10 +08:00 |
|
cxt
|
c095c5421f
|
学生访问作业列表报500
|
2017-08-03 09:42:08 +08:00 |
|
caishi
|
f49a65791a
|
我的粉丝查看全部页面样式调整
|
2017-08-02 16:47:01 +08:00 |
|
daiao
|
244f3d68f7
|
个人主页关注与粉丝切换tab
|
2017-08-02 16:45:35 +08:00 |
|
caishi
|
c653bd8553
|
Merge branch 'dev_daiao' into dev_cs
|
2017-08-02 16:37:15 +08:00 |
|
daiao
|
7bed48e3d9
|
关注和粉丝页面
|
2017-08-02 16:34:57 +08:00 |
|
daiao
|
bf472f1303
|
关注和粉丝页面
|
2017-08-02 15:38:39 +08:00 |
|
caishi
|
6e060b955e
|
全部实训加一个已发布的三角形
|
2017-08-02 15:32:04 +08:00 |
|
caishi
|
46b1ca9fbd
|
关注粉丝页面样式修改
|
2017-08-02 14:51:43 +08:00 |
|
caishi
|
8c20db0e64
|
TPI实训评论tab修改
|
2017-08-02 14:28:52 +08:00 |
|
daiao
|
9991c1244a
|
用户关注与粉丝列表
|
2017-08-02 14:24:37 +08:00 |
 miss
|
56c25b5cd6
|
拖拽线的修改
|
2017-08-02 14:17:38 +08:00 |