Commit Graph

6521 Commits

Author SHA1 Message Date
huang 615184fc38 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-06 09:26:31 +08:00
huang b39e00b5c7 项目讨论区--内容必填
添加国际化
2015-05-06 09:26:14 +08:00
lizanle 3da5fdfa0f 课程课件搜索 课程学生搜索 2015-05-05 17:19:31 +08:00
lizanle b6993e78a6 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-05 17:19:18 +08:00
lizanle 74c09f45d3 课程课件搜索 课程学生搜索 2015-05-05 17:19:06 +08:00
sw 2e26e27298 版本库收起后之保存在cookie中,刷新页面后仍保持收起状态 2015-05-05 17:08:46 +08:00
sw 2ade53053b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-05 16:33:13 +08:00
sw c60ea1db84 111 2015-05-05 16:33:01 +08:00
huang 0b524b8a40 登录后主页只显示我的项目
方法定义
功能实现
2015-05-05 16:29:53 +08:00
huang 80a7f47b15 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-05 14:11:37 +08:00
huang 6b7a17de8c 版本库Git说明信息 2015-05-05 14:11:01 +08:00
lizanle 71004e2f78 课程学生列表显示太慢,需要对表加索引 2015-05-05 10:58:37 +08:00
lizanle 8929644ab1 课程学生model 2015-05-04 17:38:38 +08:00
lizanle 96aef6dbe2 Merge remote-tracking branch 'origin/szzh' into szzh 2015-05-04 17:37:05 +08:00
lizanle c353398d65 课程学生列表功能 2015-05-04 17:36:48 +08:00
huang 41939bf7d2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/models/mailer.rb
2015-05-04 08:37:12 +08:00
huang 0d3e129c39 mailer邮件邀请页面参数修改 2015-05-04 08:36:01 +08:00
whimlex 9707a88790 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	public/stylesheets/project.css
2015-04-30 17:26:10 +08:00
whimlex 88bbd70102 项目名称导航;问题跟踪页面项目导航到问题列表页面;IE问题跟踪页面缩略图显示 2015-04-30 17:24:30 +08:00
huang 888cd508c4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-30 16:37:34 +08:00
huang 76b4ae24da 修改邮件邀请--邮件名
修改成用户点击同意按钮后才能加入项目
2015-04-30 16:30:02 +08:00
sw 4088d134df Merge branch 'guange_dev' into szzh 2015-04-30 11:23:19 +08:00
sw 74a85e1601 Merge branch 'szzh' into guange_dev 2015-04-30 11:22:42 +08:00
huang 431c6888a7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	public/stylesheets/project.css
2015-04-30 11:16:09 +08:00
huang 78c410b1ec 解决缺陷中多余的对勾图标 2015-04-30 11:10:41 +08:00
huang 119e540373 邮件邀请系统已注册的用户 2015-04-30 11:08:36 +08:00
whimlex 229d8007fe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-30 10:47:59 +08:00
whimlex 538ba33174 问题跟踪附件图片显示不拉伸 2015-04-30 10:47:34 +08:00
guange 49389ebe28 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-30 10:32:15 +08:00
guange dbccf9034d 邮件加入日志 2015-04-30 10:31:06 +08:00
lizanle f89a317a96 Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-30 09:25:27 +08:00
lizanle 2f4ac77838 schema 2015-04-30 09:25:16 +08:00
huang b67f401738 引入我的课程居中 2015-04-30 09:15:48 +08:00
sw 0a8f3faf6a 1、project.css错误代码
2、项目上传资源弹框
2015-04-30 09:02:33 +08:00
huang 389266e3e5 修改不同角色拥有的权限
管理员--配置、项目类型
开发人员-- 配置、退出项目
报告者-- 退出项目(admin可以配)
2015-04-30 07:46:07 +08:00
huang 73798a0da4 修改邮件两次点击500错误
增加功能:在点击提交时代码后自动创建用户
用户自动登录功能
2015-04-30 07:22:47 +08:00
guange aeec0d1d9c Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev 2015-04-29 23:17:51 +08:00
guange ccc004aa03 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-29 23:17:45 +08:00
guange 8384eff7f2 delayed_job条件错误 2015-04-29 23:17:24 +08:00
whimlex 33fc193e65 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-29 17:50:51 +08:00
whimlex bbe4c15293 问题跟踪图片附件和定义的样式不一时,调整图片缩略图显示方式 2015-04-29 17:50:35 +08:00
lizanle cc276c649d Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-29 17:46:52 +08:00
lizanle 519eab76bd 添加显示课程的课件列表 2015-04-29 17:46:39 +08:00
huang dfcc076a7f 角色多选的时候权限控制 2015-04-29 16:46:34 +08:00
huang 84a7bb5907 修改超级管理员不能退出项目 2015-04-29 14:57:12 +08:00
huang f94c2769e6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-29 14:29:25 +08:00
huang 135c3d9b19 课程讨论区代码重构
解决路由匹配和JS显示冲突
2015-04-29 14:29:03 +08:00
sw bec3c23edc Merge branch 'szzh' into guange_dev 2015-04-29 14:20:24 +08:00
sw bef306e94c Merge branch 'guange_dev' into szzh 2015-04-29 14:18:56 +08:00
sw 750393508a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-29 11:20:12 +08:00