Commit Graph

689 Commits

Author SHA1 Message Date
cxt f6c18c1a5e 试用申请的提示 2017-08-04 18:59:48 +08:00
daiao 9982911e2c 实训新建了选择任务,模拟实战没有重置 2017-08-04 17:28:53 +08:00
daiao 491743800e 个人主页“添加关注”无反应 2017-08-04 17:01:19 +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 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
daiao c22de54489 实训未发布只是进行模拟实战,答题正确后选择题不应该有经验值 2017-08-04 13:58:14 +08:00
cxt c25b584898 实名认证和职业认证 2017-08-04 11:20:28 +08:00
daiao 7e350746d4 我的实训中我已创建显示的数据应该按照更新时间的降序来显示 2017-08-04 11:01:57 +08:00
daiao 397e59e5d1 html实训 2017-08-04 09:38:10 +08:00
cxt c095c5421f 学生访问作业列表报500 2017-08-03 09:42:08 +08:00
daiao 7bed48e3d9 关注和粉丝页面 2017-08-02 16:34:57 +08:00
daiao bf472f1303 关注和粉丝页面 2017-08-02 15:38:39 +08:00
daiao 9991c1244a 用户关注与粉丝列表 2017-08-02 14:24:37 +08:00
daiao 7a889642c4 个人主页关注与粉丝页面 2017-08-02 10:54:39 +08:00
cxt b8f9cf6ce2 全部帖子数据取值错误 2017-08-01 10:40:50 +08:00
cxt d67b02b157 Merge branch 'develop' into dev_cxt 2017-08-01 09:32:41 +08:00
cxt 09cd573220 班级讨论区15条分页 2017-07-31 14:34:02 +08:00
daiao 6e1e199079 实训TPM“编程任务”改为“实践任务” 2017-07-31 13:54:10 +08:00
daiao 50877bb2c7 测试 2017-07-28 20:36:02 +08:00
daiao c26f3ed61a 多选题 2017-07-28 20:13:25 +08:00
daiao dbd3ed3f18 更新经验值和金币值 2017-07-28 20:01:34 +08:00
huang 33a6b154e6 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-28 17:10:14 +08:00
huang d8bd851597 Merge branch 'dev_xucheng' into develop 2017-07-28 17:09:36 +08:00
cxt 8f995d7b46 Merge branch 'dev_cxt' into develop 2017-07-28 17:00:27 +08:00
cxt f82b8f0e20 班级讨论区的上线 2017-07-28 16:59:17 +08:00
daiao 643fc6ce6b 预备知识更新数据 2017-07-28 16:27:10 +08:00
daiao 1280d9a332 编程题编辑报错 2017-07-28 15:38:58 +08:00
XuCheng642 67dd627a2d 超级管理员清除功能 2017-07-28 15:27:34 +08:00
daiao 6b0abd4703 tpi单选多选题 2017-07-28 10:40:37 +08:00
daiao 9b4478d629 Merge branch 'dev_cs' into dev_daiao 2017-07-27 14:45:34 +08:00
daiao 2a7111c800 单选多选题 2017-07-27 14:44:27 +08:00
daiao 12dea63148 实训TPM参考答案 2017-07-27 14:30:26 +08:00
huang 3834a26b6e Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-07-27 12:32:35 +08:00
huang 2a2386915b webssh添加语言接口 2017-07-27 12:32:22 +08:00
cxt 115feb98b2 Merge branch 'develop' into dev_cxt 2017-07-27 11:09:40 +08:00
cxt 33c19ff949 Merge branch 'dev_xucheng' into develop 2017-07-27 10:55:33 +08:00
XuCheng642 a348d23889 超级管理员的实训课程列表bug修复 2017-07-27 10:32:55 +08:00
daiao 2064dfb502 Merge branch 'develop' into dev_daiao 2017-07-27 10:27:36 +08:00
daiao 6ce887424b tpm增加预备知识 2017-07-27 10:07:58 +08:00
cxt e9e4b7177e Merge branch 'dev_xucheng' into develop
Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/managements/_shixun_authorization_list.html.erb
2017-07-27 09:49:02 +08:00
XuCheng642 0621ceb861 超级管理员页面修改 2017-07-27 09:45:31 +08:00
cxt a170bdf3f1 Merge branch 'develop' into dev_cxt 2017-07-27 09:00:36 +08:00
cxt 4a0d8ab856 实训套件的编辑 2017-07-26 19:05:46 +08:00
cxt a48483ef69 实训套件的编辑页面 2017-07-26 18:57:08 +08:00
daiao 6d4be8bbd9 Merge branch 'dev_cs' into dev_daiao
Conflicts:
	app/views/challenges/_content_list.html.erb
	app/views/challenges/_edit_task_pass.html.erb
	app/views/challenges/_task_pass_form.html.erb
2017-07-26 18:54:13 +08:00
daiao 0bf70f145e 单选多选题的编辑/新建页面 2017-07-26 18:50:52 +08:00
cxt 79dca41031 班级讨论区 2017-07-26 16:28:34 +08:00