Commit Graph

2584 Commits

Author SHA1 Message Date
z9hang 4dc2a23f9d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-30 15:31:23 +08:00
z9hang 03b212e363 首页定制,是否显示课程,竞赛 2014-07-30 15:26:55 +08:00
yanxd 281c48c0b3 . 2014-07-30 10:18:49 +08:00
z9hang 847bb35906 修正谷歌浏览器贴吧图标偏移问题 2014-07-30 10:00:07 +08:00
z9hang 5800cf5fff 修正登陆错误 2014-07-30 08:58:28 +08:00
z9hang 952fcce0de Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-29 18:04:45 +08:00
z9hang c60188038e 得分机制修改 2014-07-29 18:04:35 +08:00
sw 28606f030d 修复搜索参赛作品结果翻页跳转不正确的BUG 2014-07-29 17:55:14 +08:00
sw c4aa9aadbe Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-29 17:47:37 +08:00
sw b05e112a3f 1.修改邮件服务器配置
2.查询竞赛作品在js中提交,增加搜索条件是不是为空的判断
3.查询结果取消按照时间/活跃度排序功能
2014-07-29 17:47:20 +08:00
sw 3119d9a9aa 增加竞赛作品的搜索功能 2014-07-29 17:35:22 +08:00
nwb 81b77bc870 文件删除修改 2014-07-29 16:14:49 +08:00
sw c1bbd8a535 对于设置了完成日期的缺陷,到日期还没解决,给相关人员发一个通知邮件 2014-07-29 14:29:59 +08:00
sw e7503237f1 Merge remote-tracking branch 'origin/szzh' into szzh 2014-07-29 11:16:14 +08:00
z9hang d8fcf8eb9b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-29 10:07:02 +08:00
z9hang 225e3c396a 个人得相关分方法添加 2014-07-29 10:06:48 +08:00
sw 52dcc6d1a1 讨论区帖子添加回复时,取消修改帖子的更新时间。项目最新动态只显示最新的回复,不将帖子创建重复显示 2014-07-29 09:16:11 +08:00
sw e344f16f5c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 17:50:13 +08:00
sw 2141fcc3ca 将是否启用DTS测试移入项目模块配置 2014-07-28 17:49:28 +08:00
nwb 9da116c0e3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 17:14:20 +08:00
nwb cb4efd914e 修正项目文档删除BUG 2014-07-28 17:14:02 +08:00
yanxd bf9a992399 活跃度排序不一致 2014-07-28 15:37:26 +08:00
z9hang 0d0fb7052e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 15:16:37 +08:00
sw a39672dd14 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2014-07-28 15:09:14 +08:00
z9hang 90a35fa24a 竞赛、课程首页,贴吧动态名字过长显示问题
课程、项目编辑贴子导航丢失问题
2014-07-28 15:06:54 +08:00
sw 18ddb8604b 取消参赛作品名称、描述的字数限制 2014-07-28 14:58:01 +08:00
nwb 2c79a51e48 优化文件读取编码解析 2014-07-28 14:43:38 +08:00
z9hang 9bf8abd03b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 13:53:57 +08:00
z9hang a4ecccc048 修复贴吧动态中昵称过长回复被挤到不正确位置bug 2014-07-28 13:53:39 +08:00
nwb 1b589bf562 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 11:30:02 +08:00
nwb 74de064cca 1.文件删除权限判断优化
2.课程通知附件删除BUG修改
2014-07-28 11:29:55 +08:00
yanxd a8ed4272cc ckeditor: 描述中网址后面带有换行,projects列表出错 2014-07-28 11:03:39 +08:00
nwb f8328727cd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 10:46:15 +08:00
nwb dfdc58719a 课程主留言添加删除功能 2014-07-28 10:46:05 +08:00
z9hang 1daec14ab5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	db/schema.rb
2014-07-28 10:38:23 +08:00
z9hang 8871652e01 添加首页定制,设置是否显示"我的课程"功能 2014-07-28 10:37:22 +08:00
sw cc215e6c7b 修复个人动态图片显示不准确的问题 2014-07-28 09:47:11 +08:00
nwb ef62fc1fac 修正缺陷搜索缺陷编号显示问题 2014-07-28 09:46:19 +08:00
nwb f36ccad76a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 09:23:47 +08:00
yanxd 979d6dd067 dts_test. controller ===> model 2014-07-28 09:22:52 +08:00
nwb 983cdebbb6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-28 09:18:45 +08:00
nwb 00cf448bda 用户动态兼容空留言 2014-07-28 09:18:24 +08:00
yanxd 4fae105b96 project testing. 2014-07-25 17:43:19 +08:00
z9hang a1e06991d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-25 17:36:11 +08:00
z9hang 97531960da 首页定制添加剂修改图片大小功能 2014-07-25 16:05:33 +08:00
sw 43efd63dda Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-25 15:42:01 +08:00
sw b5b246f098 修复个性签名未自动换行的问题 2014-07-25 15:12:24 +08:00
nwb 2a4daf04f9 删除资源文件修改 2014-07-25 15:09:29 +08:00
sw ea322d6177 修复项目提交时间字的长度过长时会换行的BUG 2014-07-25 14:51:10 +08:00
nwb 6531bf5195 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-07-25 14:05:40 +08:00