caishi
/
trustieplus
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,875 Commits 24 Branches 0 Tags 198 MiB
Commit Graph

22875 Commits

Author SHA1 Message Date
huang 1f3417a974 Merge branch 'develop' 2017-10-14 16:18:56 +08:00
huang eb457f4774 add migrate 2017-10-14 15:25:07 +08:00
huang 0beebb2d52 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-14 11:09:38 +08:00
huang 0b4aed3806 pushlish game的时候同步tpi脚本 2017-10-14 11:09:15 +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 00be96425b Merge branch 'dev_xucheng' into develop 2017-10-13 23:31:02 +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
cxt a4489ca708 学生列表按成绩排序 2017-10-13 22:13:07 +08:00
XuCheng642 ee5cec2add Merge branch 'develop' into dev_xucheng 2017-10-13 22:05:15 +08:00
XuCheng642 27cf3bb3ce Merge branch 'dev_xucheng' into develop 2017-10-13 22:04:16 +08:00
XuCheng642 99c86a6e76 单位列表添加市 2017-10-13 22:02:56 +08:00
cxt 5e4a80d245 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 21:59:32 +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 f495767066 Merge branch 'develop' into dev_xucheng 2017-10-13 21:44:58 +08:00
XuCheng642 f52960e2eb Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 21:44:03 +08:00
XuCheng642 39a7165cfa Merge branch 'dev_xucheng' into develop 2017-10-13 21:43:42 +08:00
XuCheng642 ab2f6dd687 班级成员列表成绩排序 2017-10-13 21:42:30 +08:00
huang 662e4d8fb0 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 21:01:41 +08:00
huang 50653d1eb9 解决版本库空白问题 2017-10-13 21:01:25 +08:00
XuCheng642 06ad49e199 Merge branch 'develop' into dev_xucheng 2017-10-13 20:23:29 +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 e821cbab4b Merge branch 'dev_xucheng' into develop 2017-10-13 20:22:19 +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
cxt 8326189ba5 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 19:31:33 +08:00
cxt 7ff96b64ad 实训作业得分bug 2017-10-13 19:31:14 +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
huang 19129fb8c5 Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop 2017-10-13 19:07:38 +08:00
huang 818631b573 添加gitlab API，获取当前user的某个项目id 2017-10-13 19:07:06 +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 e9f2cab081 Merge branch 'develop' into dev_xucheng 2017-10-13 18:53:23 +08:00
XuCheng642 d38c142c82 Merge branch 'dev_xucheng' into develop 2017-10-13 18:52:11 +08:00