Commit Graph

7925 Commits

Author SHA1 Message Date
sw 4a781ea6b2 个人主页,助教不可以关闭课程。修改张生代码 2015-07-24 14:36:53 +08:00
sw cf58ea8a9f 密码修改成功提示错误 2015-07-24 14:31:08 +08:00
sw 7f8f957a71 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-24 14:27:45 +08:00
sw 24a9a5034c 编程作业取消导出附件按钮 2015-07-24 14:27:30 +08:00
sw 430956bfe5 我要反馈---下拉编辑框时边框消失 2015-07-24 14:24:31 +08:00
zhangshenjerry d38b840c4b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-24 14:00:50 +08:00
zhangshenjerry 2f497f36d0 正确修改密码后建议给出“密码修改成功,请重新登录”的提示信息 2015-07-24 14:00:02 +08:00
sw 0e56a79622 课程通知查询不使用ajax局部刷新 2015-07-24 11:50:50 +08:00
lizanle f521ca424d 首页动态优化 2015-07-24 11:47:45 +08:00
lizanle a4734bb135 首页动态优化 2015-07-24 11:13:53 +08:00
lizanle ce16550545 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-24 10:56:25 +08:00
lizanle c8cb730397 首页动态优化 2015-07-24 10:56:19 +08:00
huang 111ca6517a Merge branch 'dev_hjq' into szzh 2015-07-24 09:49:42 +08:00
huang b6812d8810 Merge branch 'szzh' into dev_hjq 2015-07-24 09:49:06 +08:00
huang e5801338d6 修改最近一个月时间跨度
当前日期延生到上月的当天
2015-07-24 09:47:28 +08:00
sw f4360e66dd 编辑编程作业出错 2015-07-24 09:47:20 +08:00
lizanle e85ef7b192 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-24 09:38:03 +08:00
lizanle 8350d5f10b 首页动态优化 2015-07-24 09:37:53 +08:00
huang 2fca0f4441 提交次数代码简化 2015-07-24 09:32:12 +08:00
sw ea8f72cce9 编程作业show:两个测试结果 2015-07-24 09:24:09 +08:00
huang c0da9257cd 版本库:用户最近六个月提交次数 2015-07-24 09:19:43 +08:00
huang 127a243bd2 版本库:用户最近一月提交次数统计 2015-07-24 09:18:34 +08:00
cxt e63705bf36 Merge branch 'dev_cxt2' into szzh 2015-07-24 09:08:45 +08:00
cxt afce49839f Merge branch 'szzh' into dev_cxt2
Conflicts:
	app/views/layouts/base_users_new.html.erb
2015-07-24 09:07:58 +08:00
zhangshenjerry d639942b82 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/helpers/users_helper.rb
	app/views/layouts/base_users_new.html.erb
2015-07-24 08:58:56 +08:00
zhangshenjerry 1b3c6bde69 个人主页--留言文本框修改 2015-07-24 08:56:19 +08:00
huang a2c2f41908 版本库:最近一月的提交次数统计 2015-07-23 17:32:48 +08:00
sw 4ce693ad17 课程讨论区发送邮件增加 2015-07-23 16:49:54 +08:00
sw b781d22a62 删除课程过滤器中没有的方法,增加删除课程的action 2015-07-23 16:17:13 +08:00
sw ce17cb1da0 个人主页,TA的课程显示和课程数量、课程列表不匹配 2015-07-23 15:13:18 +08:00
cxt 8fba66d330 3251缺陷的修复 2015-07-23 15:02:26 +08:00
sw 6775008b50 加入课程数和创建课程数不正确
去除掉无用代码
2015-07-23 14:42:47 +08:00
sw 76247d74a7 公共贴吧 顶和踩之后数字未变化 2015-07-23 10:50:48 +08:00
huang 6911debad0 Merge branch 'develop' into dev_hjq 2015-07-23 10:37:52 +08:00
huang 8f02626183 删除云化部署进度条,显示成等待 2015-07-23 10:36:51 +08:00
sw c2d41ab8db 编程作业的上线 2015-07-23 10:34:44 +08:00
sw 95af2ab20b 作品列表界面导出列表功能:
普通作业:不显示匿评评分
匿评作业:显示匿评评分
编程作业:显示系统评分
2015-07-23 10:33:54 +08:00
sw f4786ea71f 学生列表加入时间对齐 2015-07-23 10:23:27 +08:00
huang 6cbafb66d9 版本库添加统计说明 2015-07-23 10:20:32 +08:00
sw 62a6478902 Merge branch 'develop' into szzh 2015-07-23 10:16:33 +08:00
sw 69024b2489 编程作业编译出错时错误信息的显示 2015-07-23 10:14:55 +08:00
sw 61cbfc90ff Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-23 10:14:11 +08:00
sw c0eea86132 增加错误信息的显示 2015-07-23 10:12:07 +08:00
huang a57aac0b72 Merge branch 'szzh' into develop 2015-07-23 09:46:59 +08:00
huang d1359d1e55 Merge branch 'szzh' into dev_hjq 2015-07-23 09:10:51 +08:00
huang 8312798cee Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-23 09:06:54 +08:00
huang fc8a81c46d Merge branch 'develop' into szzh 2015-07-23 09:06:37 +08:00
sw 61808a5152 Merge branch 'develop' into szzh 2015-07-23 09:00:48 +08:00
sw 7cf837d0bf Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-07-23 08:59:16 +08:00
sw d36e82241b Merge branch 'szzh' into develop 2015-07-23 08:57:14 +08:00