 alan
|
c18d1d9585
|
修改《匿名发布新帖》《编辑时出现跳转错误》
Signed-off-by: alan <547533434@qq.com>
|
2015-05-22 11:09:43 +08:00 |
|
alan
|
a0ca31780e
|
修改《帖子排序》《资源区链接错误》《增加回帖回复》《添加编辑器》
《展开，收起，展开回复，收起回复 的样式问题》
Signed-off-by: alan <547533434@qq.com>
|
2015-05-21 16:35:53 +08:00 |
|
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>
|
2015-05-20 17:42:26 +08:00 |
 yutao
|
a35abf1f1f
|
修复bug#2180:课程资源库：成功引入资源后，“选人我的课程”未自动刷新为“选入我的其他课程”
|
2015-05-20 11:56:34 +08:00 |
 huang
|
6e38895c3b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-19 16:11:47 +08:00 |
|
huang
|
196c3b48b1
|
资源库区分“引入我的项目”和“引入我的其它项目”
修复新建项目冲突
|
2015-05-19 16:11:22 +08:00 |
|
yutao
|
085b86bbbe
|
修复bug#2585:IE11.0中--课程--学生列表：导出列表文件名乱码
|
2015-05-19 15:23:13 +08:00 |
|
huang
|
b645a1aa1e
|
私有项目成员列表非项目成员不能通过URL访问
|
2015-05-19 14:25:10 +08:00 |
|
huang
|
0123ea32bf
|
私有项目讨论区非项目成员、未登录情况不能访问
|
2015-05-19 14:13:28 +08:00 |
|
huang
|
b19f61edcb
|
私有项目非项目成员不能通过url访问关注列表
|
2015-05-19 14:02:14 +08:00 |
|
yutao
|
ff6173c5f5
|
修复bug#2623:留言—删除留言：当留言成功删除后，留言的数量需要手动刷新才会改变。
|
2015-05-19 09:04:42 +08:00 |
|
yutao
|
4b58699ee9
|
修复bug#2270 :forge/course主页--搜索用户无任何作用
|
2015-05-18 16:41:04 +08:00 |
 guange
|
907d89e1cc
|
merge
|
2015-05-15 13:39:26 +08:00 |
|
guange
|
a1240e8743
|
将过期改为1个月
|
2015-05-15 10:27:26 +08:00 |
|
guange
|
39308dacfd
|
将setting中的domain合并到host配置中
|
2015-05-14 21:40:34 +08:00 |
|
alan
|
e3d277163f
|
修改个人主页的链接
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 16:59:43 +08:00 |
|
guange
|
af107d861b
|
将下载信息放到课程动态
|
2015-05-13 16:44:12 +08:00 |
|
guange
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
2015-05-13 16:22:44 +08:00 |
|
guange
|
f31fe81c5d
|
将课程通知中的附件提到列表和动态中
|
2015-05-13 15:33:35 +08:00 |
|
alan
|
a8d19a119a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-13 14:34:07 +08:00 |
|
alan
|
fe2f6a0d9d
|
修改样式以及添加回复取消功能
Signed-off-by: alan <547533434@qq.com>
|
2015-05-13 14:31:54 +08:00 |
|
huang
|
406d608edc
|
版本库私有权限设置
--项目成员可以查看
--左侧入口隐藏
--禁止通过url访问
|
2015-05-13 11:46:19 +08:00 |
|
guange
|
50575c1c20
|
issue的排序经一线人员使用，还是按创建时间排序好
|
2015-05-13 09:45:09 +08:00 |
|
guange
|
80d44e4f4c
|
新版项目的上传图标问题解决
|
2015-05-12 17:46:54 +08:00 |
|
alan
|
fe92b05026
|
讨论区编辑添加附件
Signed-off-by: alan <547533434@qq.com>
|
2015-05-12 17:14:07 +08:00 |
|
alan
|
8773842801
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 17:35:36 +08:00 |
|
alan
|
8e61136d7f
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 17:23:53 +08:00 |
|
alan
|
ee18ba7051
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/boards/_course_show.html.erb
app/views/boards/_project_show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 16:25:17 +08:00 |
|
alan
|
25bcc676b9
|
增加附件功能以及修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
2015-05-11 16:23:15 +08:00 |
 sw
|
f12a20f85e
|
用户修改资料保存报错
|
2015-05-08 16:32:55 +08:00 |
|
sw
|
25e80cefb8
|
Merge branch 'szzh' into guange_dev
|
2015-05-08 15:44:47 +08:00 |
|
huang
|
f7ad600dde
|
发布帖子不能删除
|
2015-05-08 15:02:04 +08:00 |
|
guange
|
5c4ad1ce7d
|
merge
|
2015-05-08 14:31:23 +08:00 |
|
guange
|
eed39ef0ef
|
上传头像会进行压缩
|
2015-05-08 14:28:17 +08:00 |
|
alan
|
23ef975c23
|
讨论区修改bug
Signed-off-by: alan <547533434@qq.com>
|
2015-05-08 13:04:25 +08:00 |
|
sw
|
78f30344b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-08 09:55:00 +08:00 |
|
alanlong9278
|
336b59f606
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/tags/_tag_name.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
2015-05-08 09:15:50 +08:00 |
|
sw
|
3cb8962f01
|
登录后域名改为user.truestie.net
|
2015-05-07 17:16:09 +08:00 |
|
alan
|
4bf08e49da
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-07 16:10:22 +08:00 |
|
alan
|
08f1c39033
|
修改课程讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
2015-05-07 16:10:07 +08:00 |
|
sw
|
0ec08f9361
|
打零分作品仍在未批作品列表显示
|
2015-05-07 11:47:34 +08:00 |
|
alan
|
4546095ed4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-07 09:53:50 +08:00 |
|
alan
|
eee0df8d22
|
修改课程，项目的讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
2015-05-07 09:53:34 +08:00 |
|
sw
|
cba473269d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-07 09:31:22 +08:00 |
 lizanle
|
c9d66c7f5f
|
项目issue翻页后查询条件丢失修改
|
2015-05-07 09:22:30 +08:00 |
|
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 |
|
huang
|
aabdd1a4d7
|
剔除新建问题状态时不必要的代码
|
2015-05-06 16:56:08 +08:00 |
|
sw
|
b456bc0e62
|
评分支持打0分
|
2015-05-06 16:55:59 +08:00 |
|
guange
|
9ba55296f5
|
修改密码完成后跳到个人资料
|
2015-05-06 15:17:42 +08:00 |