Commit Graph

2906 Commits

Author SHA1 Message Date
nwb 633c4278d8 修改课程列表视图 2014-07-07 10:12:07 +08:00
nwb 0471446ac8 新增、修改缺陷发送邮件的缺陷编写优化 2014-07-07 10:07:50 +08:00
nwb beeb707347 用户未登陆时首页不提示“该学校未开设任何课程” 2014-07-07 09:37:45 +08:00
nwb 5f18b1a38c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-05 15:11:57 +08:00
z9hang f5b69be967 新建贴吧描述为空不能新建、搜索空内容添加提示 2014-07-05 14:43:15 +08:00
nwb fb8e97ff61 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/projects/show.html.erb
2014-07-05 13:51:41 +08:00
nwb eb15edd5ff 1.添加文档
2.邮件中缺陷序号计算机制优化
2.项目、课程动态优化
2014-07-05 13:31:32 +08:00
z9hang 5c93442c79 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-05 11:44:21 +08:00
z9hang 01da0852e3 新建贴吧错误提示修改 2014-07-05 11:44:05 +08:00
sw 6365d01051 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-05 11:21:27 +08:00
sw f1b8b7caed t 2014-07-05 11:20:59 +08:00
z9hang 470f40db82 去除绝对网址 2014-07-05 11:00:01 +08:00
z9hang 011d161f8f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-05 09:49:57 +08:00
yanxd db28ecd883 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-05 09:40:11 +08:00
yanxd 2fa9a4855c 最后创建人信息的正确显示(+去掉了乱78糟的table套table)
div-class内标明activity-title等,内嵌css属性等没有问题再移动出html文件
2014-07-05 09:39:58 +08:00
nwb c927bb6fd6 首页课程列表修改 2014-07-05 09:33:52 +08:00
z9hang 8c65e1ac03 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 16:56:26 +08:00
z9hang c709545809 提交后点击版本库才刷新项目积分问题(尚需测试) 2014-07-04 16:55:59 +08:00
sw 8b389776a1 打开缺陷列表改为从新建窗口打开 2014-07-04 16:14:11 +08:00
sw 65c25feabb 修复项目的缺陷模块改版之后,新增缺陷界面找不到的问题 2014-07-04 16:00:18 +08:00
nwb fd25f42e61 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 15:41:38 +08:00
nwb 2395ee4b1d 留言发送邮件优化 2014-07-04 15:41:26 +08:00
sw eac725a0f4 修改作业、用户、课程界面中相关学校的链接 2014-07-04 15:21:56 +08:00
sw 698870ddee Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 14:48:06 +08:00
sw 71b17cd98e 1 2014-07-04 14:47:38 +08:00
yanxd 8ccc39ae71 首页更多报错 2014-07-04 14:43:57 +08:00
nwb b6ebbab830 项目版本库名称限定优化 2014-07-04 14:19:34 +08:00
sw 62bcccedea 新建作业时给必填项添加*号 2014-07-04 14:04:31 +08:00
sw bc9f1e5a01 1.修改软件创客中每个用户内容显示不一致的BUG
2.去掉用户项目列表最后一个项目后的逗号
2014-07-04 13:59:08 +08:00
nwb b42605accd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 13:38:50 +08:00
nwb 864ef17941 清理课程状态表,修正同一课程出现多次的BUG 2014-07-04 13:38:34 +08:00
sw b492ead0c0 修改学校链接 2014-07-04 11:51:26 +08:00
sw a1920ca54c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 11:31:09 +08:00
yanxd 36c90f1dfd 取不到学校,再拿id直接空指针 2014-07-04 11:30:41 +08:00
sw 0e0b8fb8d8 历史数据中当课程名称字段为空时从项目列表里获取名称 2014-07-04 11:30:22 +08:00
sw 1e6693cdcf 1.取消软件创客界面2个个人得分显示
2.修复软件创客界面用户参与课程显示不正确的BUG
3.添加获取用户参与的未过期的项目列表
2014-07-04 11:26:37 +08:00
yanxd d54f37e630 个人动态,判断留言人逻辑有误 2014-07-04 11:15:58 +08:00
nwb ff8994fc9d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 11:11:38 +08:00
nwb 08a6dec39d 课程讨论区回复时主题只读 2014-07-04 11:11:27 +08:00
sw 2506e8e50d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 10:30:14 +08:00
sw 108866b8ba 1 2014-07-04 10:29:31 +08:00
sw 016ef25019 1.注释无效代码
2.修改软件总包列表分页统一使用@bid_count
2014-07-04 10:22:35 +08:00
z9hang d525220aca Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 10:10:41 +08:00
z9hang 2dd249a105 修正发帖不填主题报错问题,修正发帖内容为空可成功发布bug、修改主页贴吧动态里回帖数字颜色、修改昵称字符为不超过25个 2014-07-04 10:10:20 +08:00
nwb dc0180988f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 09:10:36 +08:00
nwb d001b4416a 1.优化课程首页
2.优化课程首页搜索逻辑
2014-07-04 09:10:17 +08:00
yanxd 81327e48aa Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-04 09:02:54 +08:00
yanxd 8420163c29 doc/(git workflow
update rmagick Installation
2014-07-04 09:02:33 +08:00
sw 7acf73c4ca 修复未登陆用户进入学校主页列表出错的问题 2014-07-04 08:42:00 +08:00
sw fd1f3b45c9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-03 18:21:18 +08:00