Commit Graph

13751 Commits

Author SHA1 Message Date
txz 39c64c9198 解决冲突 2016-04-21 10:41:54 +08:00
txz 8e254ff722 微信loading弹框 2016-04-21 10:38:36 +08:00
huang e8048f8eb7 完成版本库时间UTC与北京时间的转换
时间国际化问题
2016-04-21 10:09:52 +08:00
cxt 76b37d7670 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-04-21 10:02:16 +08:00
cxt 26b1aee90d 修改周海芳老师四个作业的截止日期和学生得分 2016-04-21 10:01:12 +08:00
yuanke 85055f2a84 博客列表修改 2016-04-21 09:39:21 +08:00
txz 6e6a29cfa6 api路径更改 2016-04-20 17:04:59 +08:00
huang 449bdf2225 完成版本库统计功能 2016-04-20 16:40:44 +08:00
yuanke 8f62cccfd6 Merge branch 'yuanke' into develop
Conflicts:
	db/schema.rb
2016-04-20 16:14:26 +08:00
yuanke ff177557c8 修改代码测试列表报500 2016-04-20 16:13:06 +08:00
yuanke 29115bca3a 博客列表修改 2016-04-20 16:12:20 +08:00
txz 90a47ac158 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-20 15:45:39 +08:00
txz 0b82bf50c2 微信内容中图片正常显示 2016-04-20 15:45:33 +08:00
cxt 06f15735fe Merge branch 'weixin_guange' into develop 2016-04-20 15:15:54 +08:00
cxt aed3818273 点击模板消息跳到微信详情页面 2016-04-20 14:44:10 +08:00
yuanke 4182bb5fe7 111 2016-04-20 14:39:38 +08:00
cxt ef987d6bf7 模板消息中有html标签 2016-04-20 10:44:54 +08:00
yuanke c6174406fb 数据库语句使用rails已有的 2016-04-20 10:39:07 +08:00
txz 282e1b41e1 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-20 10:08:16 +08:00
txz 6957c24da5 微信最新动态页面调整 2016-04-20 10:08:03 +08:00
yuanke dc3837da76 Merge branch 'cxt_course' into yuanke
Conflicts:
	db/schema.rb
2016-04-20 09:59:37 +08:00
yuanke bc59ce0b60 Merge branch 'yuanke' into develop
Conflicts:
	db/schema.rb
2016-04-20 09:55:29 +08:00
yuanke 0f5fe51f97 1.管理员界面代码测试列表的修改
2.代码查重按钮位置
3.查重结果样式
2016-04-20 09:51:51 +08:00
txz 45aa157ff0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-19 16:26:29 +08:00
txz d0331da0c2 微信最新动态样式调整 2016-04-19 16:26:05 +08:00
huang 4e4cb309a9 版本库目录最新动态 2016-04-19 15:03:47 +08:00
cxt 87619f4078 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-19 13:03:22 +08:00
cxt 1ded6ddf04 学生无法编辑已提交的编程作品 2016-04-19 13:03:12 +08:00
huang b1f47fe120 历史版本不能删除问题 2016-04-19 11:19:29 +08:00
huang 43f5f821d5 组织未登录用户不显示设置按钮 2016-04-19 11:10:58 +08:00
huang ade19af9f2 未登录附件不能下载问题 2016-04-19 10:55:17 +08:00
huang a907089bd0 附件历史版本可以删除 2016-04-19 10:41:48 +08:00
huang ad3d27d6b0 版本库文件目录 2016-04-19 10:21:12 +08:00
cxt 0cc5eca34b 个人主页的项目列表有重复的项目 2016-04-19 09:58:51 +08:00
huang adc17c5038 代码优化
文件目录动态获取接口
文件目录显示样式
2016-04-19 09:34:55 +08:00
huang 200307ec9f 组织模块访问统计修改 2016-04-19 09:18:58 +08:00
cxt 0fa16251e7 删除学生提交的多分作品 2016-04-18 15:57:15 +08:00
huang 3b373a78fe Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-18 15:38:31 +08:00
huang 7259d607dc Merge branch 'hjq_beidou' into develop 2016-04-18 15:38:11 +08:00
huang 8064fe6c46 讨论区新建帖子代码优化 2016-04-18 15:37:32 +08:00
huang 41aa81f966 rake 任务:同步文件数 2016-04-18 14:44:29 +08:00
cxt 36d82e1315 微信绑定页面出现了两个用户名 2016-04-18 11:24:18 +08:00
txz 73b89cdde5 微信边框,回复点赞样式更改 2016-04-18 11:19:13 +08:00
yuanke 8c5497ac45 Merge branch 'yuanke' into develop 2016-04-15 19:21:11 +08:00
yuanke fcfd17c8c9 修改代码评测的一个BUG 2016-04-15 19:20:24 +08:00
yuanke 87c33725e4 Merge branch 'yuanke' into develop
Conflicts:
	app/views/student_work/work_canrepeat.js.erb
2016-04-15 19:01:11 +08:00
yuanke c1c20fda3b 修改学生也能看到代码查重的BUG 2016-04-15 18:59:47 +08:00
yuanke 3136191de8 查重修改 2016-04-15 18:51:31 +08:00
yuanke 5aba3fb11b 修改查重有时候失败的问题 2016-04-15 18:48:39 +08:00
yuanke 5efd55de2d Merge branch 'yuanke' into develop 2016-04-15 17:37:17 +08:00