 huang
|
d25c6cedd1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
697f891546
|
私有项目邮件邀请权限认证
|
11 years ago |
|
huang
|
d6aeb5b0e7
|
Merge branch 'szzh' into dev_hjq
|
11 years ago |
|
huang
|
d9ae9c8061
|
修改邮件通知提醒（邀请：未激活
点击链接：激活并加入项目）
|
11 years ago |
 alan
|
1c760e8117
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
11 years ago |
|
alan
|
f47d30f22a
|
项目首页缓存设置
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
guange
|
5279c2d3e5
|
删除所有的域的autologin
|
11 years ago |
|
guange
|
aaf7d645ba
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
11 years ago |
|
guange
|
1fe49c8cb1
|
添加删除作业功能
|
11 years ago |
|
guange
|
47e3e93a2f
|
cookies 删除也需要domain
|
11 years ago |
|
alan
|
32a6c29c7c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
Gemfile
app/views/layouts/base_projects.html.erb
app/views/projects/_development_group.html.erb
app/views/projects/_research_team.html.erb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
1b5c41b3ad
|
邮件配置
|
11 years ago |
|
alan
|
59c77e870c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
db/schema.rb
public/javascripts/course.js
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
8e74712b86
|
Merge branch 'szzh' into dev_hjq
|
11 years ago |
|
huang
|
5af284e8a4
|
项目资源统计代码优化
|
11 years ago |
|
guange
|
1975df63d4
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
9ce1916fbb
|
autologin token cookies domain修改
|
11 years ago |
|
huang
|
b89ff45fc2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
a6da2b4a01
|
项目添加新的编辑器
显示页面显示样式调整
|
11 years ago |
|
huang
|
f52058aaf3
|
课程首页新界面（未完成）
|
11 years ago |
|
huang
|
fc8b5c60c6
|
切换分支处理
|
11 years ago |
|
guange
|
437d4e1009
|
zip下载必须得登录
|
11 years ago |
|
guange
|
c9b46e4e3a
|
头像上传bug修复
|
11 years ago |
 sw
|
26ae4b7d74
|
用户头像不能上传
|
11 years ago |
|
huang
|
ceafa459fd
|
issues编辑时跳转问题
|
11 years ago |
|
huang
|
379de18cd6
|
修改资源库全站搜索：
1、搜索条件为空的时候，不允许显示全部资源
2、全站搜索，非自己上传的资源不允许查看
3、全站搜索，项目管理员能设置公开权限的资源在全局搜索中也可以
|
11 years ago |
|
huang
|
2ac2884bf1
|
修改issue注入异常报错（比如项目名带点号）
|
11 years ago |
|
sw
|
ec1c9c2ac1
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
alan
|
c18d1d9585
|
修改《匿名发布新帖》《编辑时出现跳转错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
a3fd541119
|
优化邮件邀请新用户、已注册用户
|
11 years ago |
|
alan
|
a0ca31780e
|
修改《帖子排序》《资源区链接错误》《增加回帖回复》《添加编辑器》
《展开，收起，展开回复，收起回复 的样式问题》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
alan
|
799f561d77
|
Merge branch 'szzh' into memcached_alan
Conflicts:
Gemfile
app/views/issues/index.html.erb
db/schema.rb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 yutao
|
a35abf1f1f
|
修复bug#2180:课程资源库：成功引入资源后，“选人我的课程”未自动刷新为“选入我的其他课程”
|
11 years ago |
|
huang
|
6e38895c3b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
196c3b48b1
|
资源库区分“引入我的项目”和“引入我的其它项目”
修复新建项目冲突
|
11 years ago |
|
yutao
|
085b86bbbe
|
修复bug#2585:IE11.0中--课程--学生列表：导出列表文件名乱码
|
11 years ago |
|
huang
|
b645a1aa1e
|
私有项目成员列表非项目成员不能通过URL访问
|
11 years ago |
|
huang
|
0123ea32bf
|
私有项目讨论区非项目成员、未登录情况不能访问
|
11 years ago |
|
huang
|
b19f61edcb
|
私有项目非项目成员不能通过url访问关注列表
|
11 years ago |
|
yutao
|
ff6173c5f5
|
修复bug#2623:留言—删除留言：当留言成功删除后，留言的数量需要手动刷新才会改变。
|
11 years ago |
|
yutao
|
4b58699ee9
|
修复bug#2270 :forge/course主页--搜索用户无任何作用
|
11 years ago |
|
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
11 years ago |
|
guange
|
907d89e1cc
|
merge
|
11 years ago |
|
guange
|
a1240e8743
|
将过期改为1个月
|
11 years ago |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
11 years ago |
|
alan
|
e3d277163f
|
修改个人主页的链接
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
guange
|
af107d861b
|
将下载信息放到课程动态
|
11 years ago |
|
guange
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
11 years ago |
|
guange
|
f31fe81c5d
|
将课程通知中的附件提到列表和动态中
|
11 years ago |
