Commit Graph

7472 Commits

Author SHA1 Message Date
yutao b6f3233318 bug#2304:新版项目--wiki:如图,建议修改上传附件显示样式 2015-06-15 12:12:12 +08:00
yutao 21ff990c65 bug#2812:forge主页、course主页搜索建议做成下拉按钮的样式 2015-06-15 11:18:44 +08:00
yutao e874f4406c ... 2015-06-15 11:15:19 +08:00
huang aacd3af1fe 缺陷状态更新后,按天发送邮件通知 2015-06-15 10:53:57 +08:00
huang 75c8d6f422 Merge branch 'szzh' into dev_hjq 2015-06-15 10:35:34 +08:00
huang b2f7b0f670 编辑器(未改动) 2015-06-15 10:34:23 +08:00
lizanle 055360a03c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-15 10:09:03 +08:00
lizanle 96220a0147 schema.rb 2015-06-15 10:08:05 +08:00
sw 1637977159 Merge branch 'szzh' into develop 2015-06-13 15:24:25 +08:00
sw 06009934d8 编辑新闻无法编辑成功 2015-06-13 15:17:59 +08:00
sw 1ac206eb74 Merge branch 'develop' into szzh 2015-06-13 14:38:09 +08:00
sw 0053930769 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-13 14:37:57 +08:00
sw d62e7218cc 项目邀请用户相关问题 2015-06-13 14:37:40 +08:00
sw b5dce61c9e 作品列表学号为a标签 2015-06-13 14:21:15 +08:00
yutao fd5f2d9322 ... 2015-06-13 14:14:34 +08:00
sw 3b90bd4770 发布作业500 2015-06-13 13:48:00 +08:00
sw b4b1882e6b Merge branch 'szzh' into develop 2015-06-13 11:49:16 +08:00
sw 9df47653b1 作品评论时间显示为更新时间,并按更新时间排序 2015-06-13 10:58:39 +08:00
sw cc2bd5f7b1 作品列表收索时,收索条件内容在课程收索栏 2015-06-13 10:55:51 +08:00
sw d302c7ca86 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-13 10:23:07 +08:00
yutao e8d9d53bcc bug#2832:讨论区:回复带有图片的内容,在动态查看时,创建时间显示错位。 2015-06-13 10:10:36 +08:00
sw 4af3a28eab 课程首页:加入课程,加入失败继续显示加入课程弹框 2015-06-13 09:59:42 +08:00
sw 17294ec7ae 加入项目:加入失败不关闭加入项目弹框 2015-06-13 09:53:46 +08:00
yutao e108f8270e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-13 09:41:44 +08:00
yutao 29b2018a5a bug#2779:搜索用户结果页面项目后没有冒号,课程后又有冒号,建议统一改为没有冒号 2015-06-13 09:41:35 +08:00
huang f5f267839e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-13 09:38:12 +08:00
huang a7086c9208 版本库“收起git说面”鼠标经过变成手型 2015-06-13 09:37:45 +08:00
yutao 4a91aac3ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-13 09:35:30 +08:00
yutao 0f96fd81c1 ... 2015-06-13 09:35:22 +08:00
sw f2c87f198d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/layouts/base_projects.html.erb
2015-06-13 09:24:32 +08:00
yutao 499a6b31f9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-13 09:23:39 +08:00
yutao b42d5e3667 ... 2015-06-13 09:23:26 +08:00
sw a600d93630 111 2015-06-13 09:23:04 +08:00
huang 3854ef3610 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-12 17:50:27 +08:00
huang 2acab1719e 修改附件上传上面被截取问题 2015-06-12 17:50:05 +08:00
yutao d9157965e9 ... 2015-06-12 17:49:06 +08:00
huang 3d53c4930a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-12 17:27:47 +08:00
yutao ab64b38cee 留言提交之后清除编辑框内容 2015-06-12 17:26:40 +08:00
huang 5d88de3e6e 解决bug:加入项目对齐及注释 2015-06-12 17:26:36 +08:00
sw cd7bb85f2f 资源列表多了一个c 2015-06-12 17:25:39 +08:00
sw 2a2b93c97d 导出问卷时,多行主观的答案有html代码 2015-06-12 16:58:43 +08:00
yutao 5ac4d2afe3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-06-12 16:53:10 +08:00
yutao 482df88d70 ... 2015-06-12 16:52:49 +08:00
huang 94877bb353 修改版本格式 2015-06-12 16:48:43 +08:00
sw 1810a3eb41 111 2015-06-12 16:46:07 +08:00
sw 21a9a67bfc 移除bid 2015-06-12 16:45:23 +08:00
sw 418f75fd1f 注释无用代码 2015-06-12 16:43:52 +08:00
sw 90bd3bad58 Merge branch 'develop' into szzh 2015-06-12 16:36:54 +08:00
sw b7c04207e1 课程通知评论显示 2015-06-12 16:36:08 +08:00
sw c07f66776c 课程留言列表,拉长时显示不正确 2015-06-12 16:34:25 +08:00