Commit Graph

2743 Commits

Author SHA1 Message Date
cxt 8d0509d7f2 作业和试卷已发布的状态是显示发布时间,未发布状态显示创建时间 2017-10-17 09:33:58 +08:00
cxt 48da8d09a0 新建试卷时,在试卷标题处按回车试卷信息就保存了 2017-10-17 09:21:50 +08:00
cxt adc4f655f9 试卷中点击“向下插入xx题”时,光标需要定位到新的题目框中 2017-10-17 09:19:19 +08:00
cxt 0721c40cfc 试卷中点击“向下插入xx题”时,光标需要定位到新的题目框中 2017-10-17 09:17:49 +08:00
caishi 3e5194fcd8 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-14 10:31:35 +08:00
caishi 5bb78aeb80 实训tpi查看参考答案的弹框文字信息修改 2017-10-14 10:30:56 +08:00
XuCheng642 321414b2cc Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 23:31:20 +08:00
XuCheng642 6b8956e9ef 其他用户头像去除点击事件 课程搜索 2017-10-13 23:28:34 +08:00
daiao 7c804a6f77 PHTWeb实训 2017-10-13 22:52:13 +08:00
caishi 1826c370f3 TPI评论点赞换行 2017-10-13 22:32:57 +08:00
cxt 2529aaa7f3 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 22:13:20 +08:00
XuCheng642 99c86a6e76 单位列表添加市 2017-10-13 22:02:56 +08:00
cxt 64664d826e 实训作业说明的样式 2017-10-13 21:59:09 +08:00
cxt ab4f85565c 实训作业的说明 2017-10-13 21:57:53 +08:00
XuCheng642 3b8de931a2 单位修改 2017-10-13 21:57:17 +08:00
XuCheng642 667fc4e947 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 20:22:47 +08:00
XuCheng642 fbfa68f843 实训列表页 2017-10-13 20:20:32 +08:00
daiao bba766a026 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 20:00:14 +08:00
daiao e312c0d153 不用显示登录名,innov 改为:“3分钟前登录” 的字样,显示当前用户的最新登录情况 2017-10-13 19:59:56 +08:00
caishi a06ed3e136 Merge branch 'dev_cs' into develop 2017-10-13 19:50:27 +08:00
caishi 9cbaf8e4fc 去掉编辑试卷里面的设置 2017-10-13 19:49:07 +08:00
daiao 1772f2b405 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 19:46:28 +08:00
daiao dc79af7f16 PHPweb实训只有评测后才能点击查看效果 2017-10-13 19:45:48 +08:00
miss f661d4d9f2 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 19:45:22 +08:00
miss c93f446e5a 删除资源的tip问题 2017-10-13 19:44:58 +08:00
daiao 3733b3ed92 PHP实训 2017-10-13 19:26:04 +08:00
daiao 345eac26e7 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 19:19:18 +08:00
daiao eab4e2a88c PHP/Web实训 2017-10-13 19:19:03 +08:00
cxt 3f027ea05c Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
	app/views/games/_game_show.html.erb
2017-10-13 18:57:16 +08:00
daiao 95a65e114b Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 18:53:55 +08:00
daiao 9a798f3944 Merge branch 'dev_daiao' into develop
Conflicts:
	app/views/praise_tread/_edu_praise.html.erb
	app/views/users/show.html.erb
2017-10-13 18:53:32 +08:00
XuCheng642 8017a1e4d9 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 18:50:39 +08:00
XuCheng642 efac20f6a6 单位搜索剔除当前 2017-10-13 18:49:10 +08:00
cxt b3fbfb2197 Merge branch 'dev_cs' into develop 2017-10-13 18:48:41 +08:00
cxt dc88bad0fa Merge branch 'dev_cxt' into develop 2017-10-13 18:47:48 +08:00
cxt 0ad4779842 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 18:47:33 +08:00
miss 39bbbc882a Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 18:46:38 +08:00
cxt a3cf8e9697 实训路径优化 2017-10-13 16:23:39 +08:00
cxt 28c588cb5f 编辑试卷中点击某题的“向下插入xx题”按钮,弹出新建题目后点击取消,再编辑某题,给出提示不能编辑 2017-10-13 15:12:39 +08:00
cxt 478b68c872 试卷选用功能 2017-10-13 15:06:55 +08:00
caishi 5f928d4188 公共题库认证提示 2017-10-13 14:39:48 +08:00
daiao d4dfa38bd9 PHP/Web实训功能 2017-10-13 14:16:14 +08:00
caishi a35b742654 小问题 2017-10-13 11:29:59 +08:00
cxt 2b6455afef Merge branch 'dev_cs' into dev_cxt 2017-10-13 10:44:32 +08:00
cxt c3cf3d0edd 实训作业的作业描述显示与实训简介一致 2017-10-13 10:43:30 +08:00
caishi 3039110297 发送、确定、评测等按钮改为橙色背景 2017-10-13 10:43:06 +08:00
cxt 6b08813b4f 新建试卷时,在试卷标题处按回车试卷信息就保存了 2017-10-13 10:27:54 +08:00
caishi f1afd9c987 试卷选用弹框 2017-10-13 10:13:19 +08:00
miss d7cbe6e5ce Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 09:58:27 +08:00
miss 4c42d42cf2 分班样式的调整以及资源删除的样式调整 2017-10-13 09:57:47 +08:00