 lizanle
|
f214a26329
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-07 09:03:08 +08:00 |
|
lizanle
|
700d2985f6
|
项目issue翻页后查询条件丢失修改
|
2015-05-07 09:02:56 +08:00 |
 guange
|
3f88a67eef
|
编辑器支持直接粘贴QQ截屏
|
2015-05-06 23:32:34 +08:00 |
whimlex
|
3b5d8f76a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-06 17:41:36 +08:00 |
|
whimlex
|
3c72af69ea
|
版本库刷新页面时“git操作指南”展开收起保持一致
|
2015-05-06 17:41:18 +08:00 |
 huang
|
aabdd1a4d7
|
剔除新建问题状态时不必要的代码
|
2015-05-06 16:56:08 +08:00 |
 sw
|
b456bc0e62
|
评分支持打0分
|
2015-05-06 16:55:59 +08:00 |
|
huang
|
fd28310e15
|
修改issue列表太长换行问题
|
2015-05-06 16:37:18 +08:00 |
|
sw
|
e32a065c09
|
关闭学生评分界面后会跳到最顶部
|
2015-05-06 15:47:02 +08:00 |
|
huang
|
a7b2ac860b
|
修改索引迁移文件不能执行的问题
|
2015-05-06 15:40:13 +08:00 |
|
guange
|
9ba55296f5
|
修改密码完成后跳到个人资料
|
2015-05-06 15:17:42 +08:00 |
|
sw
|
a5a5ccce41
|
#2452course网站课程资源个数的显示和主页显示的不一致
|
2015-05-06 15:05:57 +08:00 |
|
sw
|
cba760b8b0
|
课程、项目搜索提示
|
2015-05-06 15:01:26 +08:00 |
|
sw
|
4c268b13dd
|
#2460匿评分配数量限制长度
|
2015-05-06 14:55:48 +08:00 |
|
sw
|
6bbf8c8f45
|
课程通知、课程留言取消按钮删除编辑器内内容
|
2015-05-06 14:53:25 +08:00 |
|
sw
|
c0b7819870
|
修改资料时昵称提示以及样式
|
2015-05-06 14:20:55 +08:00 |
|
guange
|
297cb9182e
|
开发本地还是采用filecache
|
2015-05-06 11:08:33 +08:00 |
|
guange
|
bd54edd770
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-06 11:05:09 +08:00 |
|
guange
|
05428213a2
|
让session保持，防止长时间编辑时session丢失
|
2015-05-06 11:04:57 +08:00 |
|
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 |
 alan
|
3f859065f2
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-05 14:33:12 +08:00 |
|
alan
|
d73ed9e467
|
项目讨论区改版
Signed-off-by: alan <547533434@qq.com>
|
2015-05-05 14:32:40 +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 |
|
guange
|
31c78d295e
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-05 11:46:15 +08:00 |
|
guange
|
86af233042
|
修正autologin多终端登录问题
|
2015-05-05 11:45:58 +08:00 |
|
lizanle
|
71004e2f78
|
课程学生列表显示太慢，需要对表加索引
|
2015-05-05 10:58:37 +08:00 |
|
alan
|
a5760afa68
|
项目讨论区界面更改
Signed-off-by: alan <547533434@qq.com>
|
2015-05-04 17:44:03 +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 |
|
alan
|
14a4cfa0db
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-04 16:25:00 +08:00 |
|
alan
|
54078e114c
|
redis缓存服务器的搭建以及对首页的缓存设置
Signed-off-by: alan <547533434@qq.com>
|
2015-05-04 15:20:40 +08:00 |
|
alan
|
5c67cfc6b6
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into memcached_alan
|
2015-05-04 14:58:22 +08:00 |
|
alan
|
c80263a66e
|
Merge branch 'guange_dev' into memcached_alan
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
config/environments/production.rb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
2015-05-04 14:58:11 +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
|
a38e0ab392
|
Merge branch 'szzh' into develop
|
2015-04-30 11:24:09 +08:00 |