 sw
|
8c6160f496
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-11 09:19:20 +08:00 |
 chenmin
|
e3ab21e409
|
修复当登陆的用户的学校没有课程时的课程列表显示bug
|
2014-08-11 09:19:40 +08:00 |
linhk
|
044bba4d0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 16:44:00 +08:00 |
|
linhk
|
0028c11426
|
退出项目功能
|
2014-08-08 16:43:34 +08:00 |
|
sw
|
6ab17a2bf7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 16:41:36 +08:00 |
|
sw
|
db826a71ff
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 16:19:58 +08:00 |
|
chenmin
|
6037421c7d
|
修复没有课程的学校显示bug
|
2014-08-08 15:45:06 +08:00 |
|
chenmin
|
dd64f13e49
|
课程列表空行bug
|
2014-08-08 15:37:26 +08:00 |
|
sw
|
006d1eac8f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-08 15:34:44 +08:00 |
 z9hang
|
87f6f81279
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 15:09:48 +08:00 |
|
z9hang
|
683cd9f918
|
个人积分修改
|
2014-08-08 13:47:02 +08:00 |
|
sw
|
b5e8b12806
|
修改密码页面查询按钮改为确定
|
2014-08-08 11:32:15 +08:00 |
|
linhk
|
3d76b26e26
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-08 09:31:42 +08:00 |
|
linhk
|
70a1839e74
|
英文界面-用户下拉菜单（我的课程、项目、编辑资料）显示问题
|
2014-08-08 09:30:48 +08:00 |
 zhanghaitao
|
dbe8456fd5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 17:56:49 +08:00 |
|
zhanghaitao
|
eac85b338f
|
标示错误修改
|
2014-08-07 17:56:29 +08:00 |
|
linhk
|
192bc8d89c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 17:16:26 +08:00 |
|
linhk
|
cb4869fd20
|
解决新建版本库名长255个字符时异常
解决版本库名长时，界面显示错误
|
2014-08-07 17:16:00 +08:00 |
|
chenmin
|
f2f7dfaf12
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 16:21:00 +08:00 |
|
chenmin
|
d087c52314
|
课程动态为空判断
|
2014-08-07 16:20:46 +08:00 |
|
zhanghaitao
|
4c71af51f4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 15:54:22 +08:00 |
|
zhanghaitao
|
f3fe5d918e
|
#832 状态联动问题的解决
|
2014-08-07 15:54:05 +08:00 |
|
linhk
|
b545c5034d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/en.yml
|
2014-08-07 12:02:55 +08:00 |
|
sw
|
b0b3f257a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-07 11:31:39 +08:00 |
|
sw
|
dac4042ee9
|
ttt
|
2014-08-07 11:31:24 +08:00 |
|
zhanghaitao
|
68a86c5e5d
|
#873 #829问题修改
|
2014-08-07 11:20:24 +08:00 |
|
sw
|
34af8053cc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-07 09:23:28 +08:00 |
|
linhk
|
0c00754057
|
解决谷歌浏览器再上传相同文件时不可用
|
2014-08-07 09:13:01 +08:00 |
|
sw
|
a4199e4c54
|
修改错误代码
|
2014-08-06 15:39:06 +08:00 |
|
sw
|
22335b23a6
|
修复新建账号申请项目时在申请列表无法显示的BUG #1180
|
2014-08-06 15:10:53 +08:00 |
|
linhk
|
23c9d5381e
|
注册界面失败填写信息继续保留
修改注册见面企业提交失败姓、名内容错误Bug
|
2014-08-06 14:41:22 +08:00 |
|
z9hang
|
1ca6447478
|
修复项目缺陷、新闻、讨论区等页面无法查看bug
|
2014-08-05 17:31:05 +08:00 |
|
z9hang
|
b4be18ab9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/files_controller.rb
|
2014-08-05 16:41:23 +08:00 |
|
z9hang
|
7907edf168
|
更新项目得分规则
调整项目列表显示样式
|
2014-08-05 16:39:33 +08:00 |
|
sw
|
c155ebdfd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-05 15:38:01 +08:00 |
|
chenmin
|
fbe3e535b4
|
修复课程资源排序bug
修复课程动态时间段约束bug
|
2014-08-05 15:23:01 +08:00 |
|
z9hang
|
2c77d1b4cf
|
访问资源库问题
|
2014-08-05 11:10:41 +08:00 |
|
linhk
|
65174ad8ef
|
项目--wiki--重定向/重命名：“重”字被掩盖
|
2014-08-05 09:19:05 +08:00 |
|
linhk
|
f8d7aeebac
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-08-05 08:49:28 +08:00 |
|
chenmin
|
226d19b912
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-04 17:36:44 +08:00 |
|
sw
|
37e5bdee22
|
修复某些课程动态内容为空的BUG #1128
|
2014-08-04 17:36:07 +08:00 |
|
chenmin
|
8c8127c8d9
|
1016 修复课程显示界面空行问题；
|
2014-08-04 17:36:04 +08:00 |
|
z9hang
|
426ea23d6e
|
回复帖子内容为空时报错问题
|
2014-08-04 17:30:29 +08:00 |
|
sw
|
94f6e871b1
|
修改新建用户时企业名不是英文且提示错误的BUG #1130
|
2014-08-04 15:49:23 +08:00 |
|
sw
|
8b3b1bdcfa
|
取消编辑参赛作品时注意提示
|
2014-08-04 15:36:19 +08:00 |
|
sw
|
9cb026ed39
|
增加竞赛删除评论的功能
|
2014-08-04 15:01:39 +08:00 |
|
z9hang
|
80b2a2dc45
|
修正公共贴吧新建帖子问题
修正课程列表错误
|
2014-08-04 12:23:20 +08:00 |
 linhk
|
653c505471
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-04 09:39:14 +08:00 |
|
sw
|
209c1aeaab
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-02 17:06:39 +08:00 |
|
sw
|
69f7f97bf8
|
修复个人动态主页缺陷描述超出页面的BUG
|
2014-08-02 17:05:56 +08:00 |
zhanghaitao
|
01ab676622
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-02 15:17:21 +08:00 |
|
zhanghaitao
|
5a5ac28833
|
用户列表显示修改
|
2014-08-02 15:16:51 +08:00 |
|
linhk
|
25cfb7aa71
|
解决谷歌浏览器新建版本库文本框会默认填写缓存内容的问题
|
2014-08-02 14:43:05 +08:00 |
|
z9hang
|
ff02c4f9f2
|
修正课程显示老师、学生人数与课程中老师、学生数量不一致问题
修正学校主页课程推荐中显示的课程人数与课程总人数不一致问题
|
2014-08-01 17:43:06 +08:00 |
|
sw
|
c5a7497910
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-01 17:36:50 +08:00 |
|
sw
|
63cfa9b35a
|
取消打包下载的ajax
|
2014-08-01 16:14:00 +08:00 |
 nwb
|
204ced9490
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-01 16:00:06 +08:00 |
|
nwb
|
5a2d0ce649
|
issue#1077 新建竞赛的奖金换行显示，长度约束
|
2014-08-01 15:52:18 +08:00 |
|
linhk
|
54a246b6e6
|
中国高校搜索文本Enter快捷操作
|
2014-08-01 15:46:05 +08:00 |
|
z9hang
|
0d46c63c54
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-08-01 14:55:55 +08:00 |
|
z9hang
|
2ad51d7afe
|
修改引用的留言为不能修改
|
2014-08-01 14:08:38 +08:00 |
|
zhanghaitao
|
c1519984de
|
Issue#1091,文本显示修改
|
2014-08-01 13:56:12 +08:00 |
|
sw
|
b8f27b51c0
|
取消主页加入课程链接
|
2014-08-01 11:37:14 +08:00 |
|
sw
|
d5ac443f90
|
修复竞赛列表搜索结果不正确的BUG
|
2014-07-31 17:02:30 +08:00 |
|
sw
|
8b80d99a70
|
修复资源标记搜索不正确的BUG issues#1089
|
2014-07-31 14:39:18 +08:00 |
|
sw
|
7b32debb92
|
修复谷歌浏览器用户列表翻到第5页后角色信息和翻页列表在同一行的BUG
|
2014-07-31 13:55:22 +08:00 |
|
sw
|
a9fad79c8d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-31 11:35:50 +08:00 |
|
sw
|
bb6be3ed8a
|
修改html错误
|
2014-07-31 11:35:16 +08:00 |
|
z9hang
|
27feeee03f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-31 10:21:33 +08:00 |
|
z9hang
|
8a9e2b47ad
|
调用存储过程刷新项目提交次数
|
2014-07-31 10:21:11 +08:00 |
|
sw
|
a3cbcdad51
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-31 10:13:51 +08:00 |
|
z9hang
|
290d9b1973
|
课程首页课程名过长导致个别信息显示不全问题
|
2014-07-30 16:31:59 +08:00 |
|
z9hang
|
cb6c95c632
|
课程列表提示框里有html标签问题
|
2014-07-30 16:03:23 +08:00 |
|
sw
|
31e8ad98ae
|
1.修复竞赛作品每次修改之后，都会吧图片清空的BUG
2.修改删除竞赛作品图片功能
|
2014-07-30 15:48:13 +08:00 |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
2014-07-30 15:26:55 +08:00 |
|
sw
|
1f4943483e
|
1.现在竞赛作品名称、开发人员、开发环境的长度
2.修复竞赛作品一上传的图片，编辑时资源列表不显示的问题
|
2014-07-30 13:52:55 +08:00 |
|
z9hang
|
847bb35906
|
修正谷歌浏览器贴吧图标偏移问题
|
2014-07-30 10:00:07 +08:00 |
|
sw
|
28606f030d
|
修复搜索参赛作品结果翻页跳转不正确的BUG
|
2014-07-29 17:55:14 +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 |
|
sw
|
c1bbd8a535
|
对于设置了完成日期的缺陷，到日期还没解决，给相关人员发一个通知邮件
|
2014-07-29 14:29:59 +08:00 |
|
z9hang
|
d8fcf8eb9b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-29 10:07:02 +08:00 |
|
sw
|
2141fcc3ca
|
将是否启用DTS测试移入项目模块配置
|
2014-07-28 17:49:28 +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 |
|
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
|
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 |