 alan
|
e9c1012cbe
|
修改附件上传时公开，删除位置不一致
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 17:23:55 +08:00 |
|
alan
|
b8651606be
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-14 17:11:43 +08:00 |
|
alan
|
0db90f98d5
|
wiki的attachment与讨论区冲突
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 17:09:38 +08:00 |
|
alan
|
8a8a46a5d2
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-14 17:00:22 +08:00 |
|
alan
|
e3d277163f
|
修改个人主页的链接
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 16:59:43 +08:00 |
 sw
|
9bbae3d7ac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/application.css
|
2015-05-14 16:59:27 +08:00 |
|
sw
|
dd7140f4fb
|
意见反馈。内容宽没了
|
2015-05-14 16:57:49 +08:00 |
|
sw
|
3dc1b2642a
|
发布竞赛日期选择图标有问题
|
2015-05-14 16:53:36 +08:00 |
|
sw
|
c241fc00e9
|
测试版--课程--课程作业：如图作业附件显示与图标重叠
|
2015-05-14 16:48:08 +08:00 |
|
sw
|
c129e767e5
|
测试版：公共贴吧：显示页数应该与虚线分开
|
2015-05-14 16:26:01 +08:00 |
 huang
|
574e79ff57
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-14 16:06:41 +08:00 |
|
sw
|
33365f7ea6
|
修改编辑作业时附件显示移位
|
2015-05-14 16:04:07 +08:00 |
|
huang
|
725a6e4238
|
解决发布竞赛日历问题
|
2015-05-14 16:03:37 +08:00 |
|
alan
|
0708279c5e
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 15:42:20 +08:00 |
|
huang
|
68986fa1cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-14 15:38:27 +08:00 |
|
huang
|
2c568ed370
|
修改主页下载不存在的资源500错误
定义helper方法
|
2015-05-14 15:37:25 +08:00 |
|
alan
|
8a52225f4d
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 15:19:15 +08:00 |
|
sw
|
8d44ed2189
|
课程--课程通知：取消编辑通知，应该返回通知详情页面，而非一个空白页
|
2015-05-14 15:17:30 +08:00 |
|
alan
|
f9d9ffe4d9
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-14 15:11:36 +08:00 |
|
alan
|
72ef4e1db4
|
修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 15:11:20 +08:00 |
|
sw
|
963a21283f
|
1、修改作业打分插件星星移位
2、修改返还批改结果显示不正确
|
2015-05-14 15:09:15 +08:00 |
|
sw
|
b5719aca8e
|
修改首页我要提问后新建帖子显示样式
|
2015-05-14 14:38:22 +08:00 |
|
huang
|
97780b7eef
|
私有项目可以引用其他资源
|
2015-05-14 11:14:05 +08:00 |
|
huang
|
84efdb16c9
|
解决wiki500错误
show_new代码优化（代码中存在错误）
|
2015-05-14 11:06:26 +08:00 |
|
huang
|
d60639f557
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-14 09:58:08 +08:00 |
|
huang
|
aef91be36c
|
修复新建缺陷样式冲突
|
2015-05-14 09:57:13 +08:00 |
|
alan
|
0af8c1cc38
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-05-13 17:25:49 +08:00 |
|
alan
|
bd77ad9ac1
|
展开。收起
Signed-off-by: alan <547533434@qq.com>
|
2015-05-13 17:25:31 +08:00 |
 guange
|
c0e1eb85a1
|
Merge branch 'guange_dev' into szzh
|
2015-05-13 17:16:21 +08:00 |
|
guange
|
f53691ceed
|
修复不是News的附件显示出错
|
2015-05-13 17:13:22 +08:00 |
|
guange
|
f90278fe73
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-13 16:53:24 +08:00 |
|
guange
|
af107d861b
|
将下载信息放到课程动态
|
2015-05-13 16:44:12 +08:00 |
|
huang
|
404073d76e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-13 16:25:56 +08:00 |
|
huang
|
c148a8a145
|
私有项目版本库全休修改
|
2015-05-13 16:24:46 +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
|
9f4d7fc033
|
merge
|
2015-05-13 16:00:35 +08:00 |
|
guange
|
f31fe81c5d
|
将课程通知中的附件提到列表和动态中
|
2015-05-13 15:33:35 +08:00 |
|
guange
|
eb6c3a9377
|
课程搜索很慢，原因是以前成员数计算太复杂
|
2015-05-13 14:58:11 +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 |
|
huang
|
68050b7d22
|
版本库页面脚本过长
|
2015-05-13 10:42:52 +08:00 |
|
huang
|
90559556c6
|
新建版本库，输入框对齐
|
2015-05-13 10:37:01 +08:00 |
|
huang
|
6f3621f6c0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-13 10:27:53 +08:00 |
|
huang
|
a62001c892
|
新建版本库--
如果主版本库已存在，新建的时候不允许设置主版本库
|
2015-05-13 10:27:27 +08:00 |
|
huang
|
6c500109c9
|
修改项目上传资源
|
2015-05-13 10:06:04 +08:00 |
 lizanle
|
7112d91706
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-13 09:56:50 +08:00 |
|
lizanle
|
3fae37fa90
|
课程学生列表下啦刷新显示，查看历次作业成绩的下啦刷新显示api改动
|
2015-05-13 09:56:34 +08:00 |
|
guange
|
50575c1c20
|
issue的排序经一线人员使用，还是按创建时间排序好
|
2015-05-13 09:45:09 +08:00 |
|
guange
|
aab94676bb
|
在lib里不能直接用logger,要用Rails.logger
|
2015-05-13 09:24:02 +08:00 |