 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 |
|
alan
|
f1f871ffda
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-20 17:40:48 +08:00 |
|
alan
|
4a588506a4
|
增加编辑器
Signed-off-by: alan <547533434@qq.com>
|
2015-05-20 17:38:40 +08:00 |
 huang
|
4cef831c3a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-20 17:32:46 +08:00 |
|
huang
|
e2f0aeb693
|
公共贴吧--帖子里面搜索错误
|
2015-05-20 17:32:16 +08:00 |
 lizanle
|
d6fe4082af
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-20 17:27:35 +08:00 |
|
lizanle
|
dced5f328e
|
用户留言列表api
给用户留言 api
|
2015-05-20 17:27:17 +08:00 |
 yutao
|
b0992dcd6a
|
修改bug
|
2015-05-20 16:41:55 +08:00 |
|
huang
|
f2fdd5a5b1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-20 14:41:11 +08:00 |
|
huang
|
19d911cf95
|
缺陷列表搜索栏中添加“我”
|
2015-05-20 14:40:51 +08:00 |
|
yutao
|
2dc81f354b
|
修复bug#2418:项目--配置：除“信息”模块之外的其他四个模块进行相关操作后会很快地先过渡到“信息”页面，再返回当前页面
|
2015-05-20 14:39:10 +08:00 |
|
yutao
|
a35abf1f1f
|
修复bug#2180:课程资源库：成功引入资源后，“选人我的课程”未自动刷新为“选入我的其他课程”
|
2015-05-20 11:56:34 +08:00 |
|
huang
|
fa563b60d5
|
项目issue添加周报功能
|
2015-05-20 11:12:25 +08:00 |
|
huang
|
c711e29cd5
|
1、项目成员可以查看项目私有issue。
2、区分不可见和可见issue的数目统计。
|
2015-05-20 09:35:42 +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 |
|
alan
|
ab9d74f364
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-19 14:27:04 +08:00 |
|
alan
|
052868a6b4
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-19 14:26:42 +08:00 |
|
huang
|
b645a1aa1e
|
私有项目成员列表非项目成员不能通过URL访问
|
2015-05-19 14:25:10 +08:00 |
|
huang
|
0123ea32bf
|
私有项目讨论区非项目成员、未登录情况不能访问
|
2015-05-19 14:13:28 +08:00 |
|
huang
|
be834dd334
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-19 14:02:36 +08:00 |
|
huang
|
b19f61edcb
|
私有项目非项目成员不能通过url访问关注列表
|
2015-05-19 14:02:14 +08:00 |
|
yutao
|
5184f9a31a
|
修复bug#2622:项目--问题跟踪：点击问题列表分页中某页，总是返回该页面的最下端
|
2015-05-19 13:06:02 +08:00 |
|
yutao
|
f3da7979f8
|
修复bug#2476 : 项目--问题跟踪：关于上传附件的描述的显示问题
|
2015-05-19 12:22:53 +08:00 |
|
yutao
|
895058f38e
|
修复bug#2154:成功上传课件，课程资源数统计未自动刷新
|
2015-05-19 11:30:31 +08:00 |
|
yutao
|
5cb9cc0903
|
修复bug#2211:course主页--还有空间显示课程老师的姓名就不要以省略号结束
|
2015-05-19 10:35:17 +08:00 |
|
huang
|
4b1ff190f4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-19 10:11:17 +08:00 |
|
huang
|
d42fd98dff
|
优化项目类型
|
2015-05-19 10:10:52 +08:00 |
|
yutao
|
ff6173c5f5
|
修复bug#2623:留言—删除留言：当留言成功删除后，留言的数量需要手动刷新才会改变。
|
2015-05-19 09:04:42 +08:00 |
|
yutao
|
2cc458eafd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-18 17:03:56 +08:00 |
|
yutao
|
9690dc41f6
|
修复bug#2606 :IE浏览器：测试版—中国高校：搜索学校时ajax链接错误
|
2015-05-18 17:03:26 +08:00 |
|
huang
|
5432ac4498
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-18 17:02:19 +08:00 |
|
huang
|
df48d89881
|
版本库权限封装
添加admin可以管理资源的公开私有
|
2015-05-18 17:02:02 +08:00 |
|
yutao
|
4b58699ee9
|
修复bug#2270 :forge/course主页--搜索用户无任何作用
|
2015-05-18 16:41:04 +08:00 |
|
alan
|
b4cdd9568e
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-18 14:53:30 +08:00 |
|
alan
|
34893db465
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-18 14:53:01 +08:00 |
|
huang
|
3c810a0cee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-18 11:37:06 +08:00 |
|
huang
|
3f77e2cdcf
|
资源权限公共方法定义
|
2015-05-18 11:36:29 +08:00 |
|
yutao
|
df24007dbb
|
修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开
|
2015-05-18 11:16:41 +08:00 |
 sw
|
a44cba2e6a
|
Merge branch 'develop' into guange_dev
|
2015-05-15 17:36:44 +08:00 |
|
sw
|
0e6c15c160
|
取消个人头像logo删除功能
|
2015-05-15 17:36:18 +08:00 |
 guange
|
d2a7d41963
|
头像加入大小限制
|
2015-05-15 17:35:24 +08:00 |
|
sw
|
b84f6280c2
|
wiki报500
|
2015-05-15 17:29:25 +08:00 |
|
sw
|
a8e7590b16
|
Merge branch 'szzh' into guange_dev
|
2015-05-15 16:13:47 +08:00 |
|
sw
|
81ec174387
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-15 16:13:02 +08:00 |
|
lizanle
|
056d685982
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-15 16:13:37 +08:00 |
|
lizanle
|
e1dd4823d5
|
课程通知发布api
|
2015-05-15 16:13:32 +08:00 |
|
sw
|
06a3ca9fe9
|
IE浏览器中，课程收索为空时显示不正确
|
2015-05-15 16:12:46 +08:00 |
|
sw
|
ea1a98f8ac
|
测试版--搜狗浏览器中课程名称显示为当前登录用户的用户名
|
2015-05-15 16:02:33 +08:00 |