 sw
|
328dc828c2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
c51794d754
|
提交通知连接
|
11 years ago |
 huang
|
f3b46c5823
|
项目资源库权限优化：
管理员、资源上传者拥有设置公开私有权限
私有项目不提供引用其它项目和公开功能
|
11 years ago |
|
sw
|
87564eceee
|
修改作业--->修改作品
|
11 years ago |
guange
|
11d7c234f7
|
merge
|
11 years ago |
|
guange
|
461d9cc183
|
将autologin默认过期时间改为两个月
|
11 years ago |
|
sw
|
f12a20f85e
|
用户修改资料保存报错
|
11 years ago |
|
sw
|
6a31a99c93
|
编辑课程讨论区回复时的问题
|
11 years ago |
|
sw
|
25e80cefb8
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
821ceb41cf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
5f6f7b7cdf
|
引用功能图片显示不正常
|
11 years ago |
|
huang
|
80e1d1f277
|
去掉讨论区编辑页面虚线
|
11 years ago |
|
huang
|
a5fbccc975
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
f7ad600dde
|
发布帖子不能删除
|
11 years ago |
|
sw
|
5a4f477e46
|
课程讨论区编辑、删除按钮互换
|
11 years ago |
|
sw
|
86f686efb3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
ee051f6a37
|
1、课程讨论区回复取消功能
2、课程讨论区回复时不现实主题
|
11 years ago |
|
huang
|
89ea9ddc7b
|
项目讨论区代码还原
样式调整
|
11 years ago |
|
guange
|
5c4ad1ce7d
|
merge
|
11 years ago |
|
guange
|
eed39ef0ef
|
上传头像会进行压缩
|
11 years ago |
|
sw
|
05c26aceb6
|
发布新贴按钮跳转
|
11 years ago |
|
sw
|
34dbde442d
|
还原课程讨论区
|
11 years ago |
|
sw
|
a24e4d345d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 alan
|
c21f2c3927
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
2d93cd4bdc
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
23ef975c23
|
讨论区修改bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
30c6a71cbc
|
修正新建课程讨论区跳转
|
11 years ago |
|
alan
|
07ca42b24d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
63351fc049
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
e6fe010bd7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
5167cf374c
|
项目讨论区左侧新建按钮跳转页面修改
通过传参跳入（JS实现）
|
11 years ago |
|
alanlong9278
|
087f46bf64
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
huang
|
39fe748da7
|
处理项目讨论区主题、描述内容过长
|
11 years ago |
|
alanlong9278
|
358c9aa019
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alanlong9278
|
65c2c43dcb
|
展开收起回复
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
sw
|
559b5ce7ab
|
打开缺陷在新的页面打开
|
11 years ago |
|
sw
|
78f30344b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
db6218a487
|
教师列表界面增加角色显示、教师显示真实姓名
|
11 years ago |
|
alanlong9278
|
3995c68b96
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
alanlong9278
|
3d74734607
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
alanlong9278
|
53124710d8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
sw
|
2749c4f890
|
课程配置页面，角色改为中文
|
11 years ago |
|
alanlong9278
|
49fe15a666
|
论坛js冲突
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
huang
|
7755d54ef1
|
各处中文角色统一
|
11 years ago |
|
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>
|
11 years ago |
|
huang
|
c6b1a4af59
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
3df8a99408
|
添加中文项目成员角色
|
11 years ago |
 lizanle
|
3035bf24fc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
de921be762
|
学生列表老师列表报key not find:realname
|
11 years ago |
|
alan
|
20cea86ae8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
3b58810528
|
修改课程讨论区的js
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
3cb8962f01
|
登录后域名改为user.truestie.net
|
11 years ago |
|
sw
|
ac976e59df
|
匿评可以打0分并给出提示
|
11 years ago |
|
sw
|
b684f5b361
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
e884f58956
|
匿评可以打0分并给出提示
|
11 years ago |
|
alan
|
4bf08e49da
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
08f1c39033
|
修改课程讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
5ea295f8b5
|
1、第一次进入作品列表界面 返回顶部按钮不显示
2、第一次点击返回顶部按钮无用
|
11 years ago |
|
sw
|
5f6f937fcb
|
返回顶部浏览器不兼容
|
11 years ago |
|
sw
|
f5e87451b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
0ec08f9361
|
打零分作品仍在未批作品列表显示
|
11 years ago |
|
sw
|
31f224fd82
|
返回顶部动态显示
|
11 years ago |
|
sw
|
628ffc67dd
|
课程作品列表界面增加返回顶部功能
|
11 years ago |
|
lizanle
|
f7720843a6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
2b1b1c34a6
|
项目issue翻页后查询条件丢失修改
|
11 years ago |
|
alan
|
4546095ed4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
eee0df8d22
|
修改课程，项目的讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
cba473269d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
lizanle
|
c9d66c7f5f
|
项目issue翻页后查询条件丢失修改
|
11 years ago |
|
lizanle
|
1cb3dfc833
|
项目issue翻页后查询条件丢失修改
|
11 years ago |
|
lizanle
|
6c7b92558c
|
项目issue翻页后查询条件丢失修改
|
11 years ago |
|
lizanle
|
f214a26329
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
700d2985f6
|
项目issue翻页后查询条件丢失修改
|
11 years ago |
whimlex
|
3b5d8f76a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
3c72af69ea
|
版本库刷新页面时“git操作指南”展开收起保持一致
|
11 years ago |
|
huang
|
aabdd1a4d7
|
剔除新建问题状态时不必要的代码
|
11 years ago |
|
sw
|
b456bc0e62
|
评分支持打0分
|
11 years ago |
|
huang
|
fd28310e15
|
修改issue列表太长换行问题
|
11 years ago |
|
sw
|
e32a065c09
|
关闭学生评分界面后会跳到最顶部
|
11 years ago |
|
huang
|
a7b2ac860b
|
修改索引迁移文件不能执行的问题
|
11 years ago |
|
guange
|
9ba55296f5
|
修改密码完成后跳到个人资料
|
11 years ago |
|
sw
|
a5a5ccce41
|
#2452course网站课程资源个数的显示和主页显示的不一致
|
11 years ago |
|
sw
|
cba760b8b0
|
课程、项目搜索提示
|
11 years ago |
|
sw
|
4c268b13dd
|
#2460匿评分配数量限制长度
|
11 years ago |
|
sw
|
6bbf8c8f45
|
课程通知、课程留言取消按钮删除编辑器内内容
|
11 years ago |
|
sw
|
c0b7819870
|
修改资料时昵称提示以及样式
|
11 years ago |
|
guange
|
bd54edd770
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
05428213a2
|
让session保持，防止长时间编辑时session丢失
|
11 years ago |
|
huang
|
615184fc38
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
b39e00b5c7
|
项目讨论区--内容必填
添加国际化
|
11 years ago |
|
lizanle
|
3da5fdfa0f
|
课程课件搜索 课程学生搜索
|
11 years ago |
|
lizanle
|
b6993e78a6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
74c09f45d3
|
课程课件搜索 课程学生搜索
|
11 years ago |
|
sw
|
2e26e27298
|
版本库收起后之保存在cookie中，刷新页面后仍保持收起状态
|
11 years ago |
|
huang
|
0b524b8a40
|
登录后主页只显示我的项目
方法定义
功能实现
|
11 years ago |
|
alan
|
3f859065f2
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
d73ed9e467
|
项目讨论区改版
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
6b7a17de8c
|
版本库Git说明信息
|
11 years ago |
|
guange
|
31c78d295e
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
86af233042
|
修正autologin多终端登录问题
|
11 years ago |
|
alan
|
a5760afa68
|
项目讨论区界面更改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
8929644ab1
|
课程学生model
|
11 years ago |
|
lizanle
|
96aef6dbe2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
c353398d65
|
课程学生列表功能
|
11 years ago |
|
alan
|
54078e114c
|
redis缓存服务器的搭建以及对首页的缓存设置
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5c67cfc6b6
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into memcached_alan
|
11 years ago |
|
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>
|
11 years ago |
|
whimlex
|
9707a88790
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/project.css
|
11 years ago |
|
whimlex
|
88bbd70102
|
项目名称导航；问题跟踪页面项目导航到问题列表页面；IE问题跟踪页面缩略图显示
|
11 years ago |
|
huang
|
888cd508c4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
76b4ae24da
|
修改邮件邀请--邮件名
修改成用户点击同意按钮后才能加入项目
|
11 years ago |
|
sw
|
74a85e1601
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
huang
|
431c6888a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/project.css
|
11 years ago |
|
huang
|
119e540373
|
邮件邀请系统已注册的用户
|
11 years ago |
|
whimlex
|
229d8007fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
538ba33174
|
问题跟踪附件图片显示不拉伸
|
11 years ago |
|
guange
|
49389ebe28
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
dbccf9034d
|
邮件加入日志
|
11 years ago |
|
huang
|
b67f401738
|
引入我的课程居中
|
11 years ago |
|
sw
|
0a8f3faf6a
|
1、project.css错误代码
2、项目上传资源弹框
|
11 years ago |
|
huang
|
389266e3e5
|
修改不同角色拥有的权限
管理员--配置、项目类型
开发人员-- 配置、退出项目
报告者-- 退出项目（admin可以配）
|
11 years ago |
|
huang
|
73798a0da4
|
修改邮件两次点击500错误
增加功能：在点击提交时代码后自动创建用户
用户自动登录功能
|
11 years ago |
|
guange
|
ccc004aa03
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
8384eff7f2
|
delayed_job条件错误
|
11 years ago |
|
whimlex
|
33fc193e65
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
bbe4c15293
|
问题跟踪图片附件和定义的样式不一时，调整图片缩略图显示方式
|
11 years ago |
|
lizanle
|
cc276c649d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
519eab76bd
|
添加显示课程的课件列表
|
11 years ago |
|
huang
|
dfcc076a7f
|
角色多选的时候权限控制
|
11 years ago |
|
huang
|
84a7bb5907
|
修改超级管理员不能退出项目
|
11 years ago |
|
huang
|
f94c2769e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
135c3d9b19
|
课程讨论区代码重构
解决路由匹配和JS显示冲突
|
11 years ago |
|
sw
|
bef306e94c
|
Merge branch 'guange_dev' into szzh
|
11 years ago |
|
sw
|
750393508a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
33da5b4a44
|
1、作业评论回复删除不即使刷新
2、匿评弹框样式
|
11 years ago |
|
huang
|
412052dd0d
|
修改:引入我的文件提示信息
|
11 years ago |
|
guange
|
e6f8610dea
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
6c6ef757e1
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
11 years ago |
|
guange
|
2afdd57fb6
|
修复服务器打包乱码问题
|
11 years ago |
|
whimlex
|
b5b50bef21
|
问题跟踪图片压缩不清晰
|
11 years ago |
|
sw
|
387ab567d2
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
90c143f047
|
评论上传附件换行
|
11 years ago |
|
sw
|
e6a724d439
|
编辑作业样式
|
11 years ago |
|
sw
|
4c3013f1ac
|
修改作业评价上传附件功能500
作业标题换行
|
11 years ago |
|
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传，可上传批改后的作业
2、修改作业列表作业数不显示
|
11 years ago |
|
guange
|
38ec84cde9
|
将删除版本库的操作置入后台
|
11 years ago |
|
sw
|
b3fb7914e2
|
课程通知评论编辑框不可用，解决方案：编辑跳转到新的页面
|
11 years ago |
|
guange
|
273b360b51
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
b70ada57e6
|
邮件未处理text发送类型，导致每日发送失败
|
11 years ago |
|
sw
|
261ebb916c
|
1、当login过长，用户匿评界面的星星换行
2、去掉无用的创建作业的代码，与弹出框创建作业代码冲突
|
11 years ago |
|
sw
|
827d99fce4
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
456dcf9d40
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
d2f1f7d142
|
1、当教师评论为空时，预留一部分显示
|
11 years ago |
|
sw
|
a64b3940dd
|
1、当教师评论为空时，预留一部分
|
11 years ago |
|
whimlex
|
e30c446847
|
项目私有问题提示信息
|
11 years ago |
|
sw
|
0970182cd5
|
当教师只评分不评论时，学生可以进行回复
修改作业评论回复框样式不正确，修改项目用户反馈框显示不正确
|
11 years ago |
|
whimlex
|
f3fb0115e4
|
版本库git操作文档默认展开，样式调整
|
11 years ago |
|
whimlex
|
4f48bbbfdb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
40fdda0ee2
|
版本库git帮助文档的显示与隐藏
|
11 years ago |
|
huang
|
e7d85aad27
|
修改项目配置、关注、加入、类型等不同角色显示
|
11 years ago |
|
guange
|
86347cab89
|
现在可以通过rake redmine📧test[guange] 发送测试邮件
|
11 years ago |
|
sw
|
03044d0190
|
课程--资源库：加粗上传课件分类字样
|
11 years ago |
|
huang
|
9cb31d75de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
be9beff0b4
|
解决Roles未定义
|
11 years ago |
|
sw
|
a23231ea7b
|
修改学生创建作品时的样式
|
11 years ago |
|
sw
|
2323c821d6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
f9aaaf38f9
|
打爆下载增加字符集
|
11 years ago |
|
whimlex
|
5670e2755b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
eba638b42e
|
问题跟踪编辑、更新的权限控制
|
11 years ago |
|
guange
|
56f6fa0d86
|
设置zip支持unicode
|
11 years ago |
|
huang
|
020e544b38
|
修改项目--用户反馈--两层回复样式
|
11 years ago |
|
guange
|
24ce5191c3
|
zip打包可能有乱码
|
11 years ago |
|
huang
|
4cdc1d66a2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
db8b79f3b4
|
退出项目/项目三种模式切换权限控制
|
11 years ago |
|
sw
|
64642a51e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
7e833a4727
|
缺陷图片显示小
|
11 years ago |
|
sw
|
1a33510da1
|
我要反馈、我要提问新版Editor没有边框
|
11 years ago |
|
whimlex
|
520627f010
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
cde4a892e0
|
竞赛主页竞赛通知条数对主页样式的调整
|
11 years ago |
|
guange
|
e3dd68ad24
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
449bbc553c
|
修复issue界面js报错
|
11 years ago |
|
guange
|
3299f7e726
|
正式库issue界面图片显示路径错误
|
11 years ago |
|
whimlex
|
481f7ee4ba
|
意见反馈按回退键重新计算
|
11 years ago |
|
whimlex
|
091c6125d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
85e1262769
|
意见反馈
|
11 years ago |
|
sw
|
91e37c7ab8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
54ef7e3325
|
修改课程讨论区报错
|
11 years ago |
|
whimlex
|
650ffd4397
|
课程和项目意见反馈
|
11 years ago |
|
sw
|
f67bdae22a
|
课程讨论去引用、回帖不换行
|
11 years ago |
|
whimlex
|
b61d76d94e
|
意见反馈
|
11 years ago |
|
whimlex
|
e61822d74a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
b3e0490b90
|
意见反馈
|
11 years ago |
|
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
11 years ago |
|
guange
|
5c0d0230fc
|
去掉首页底部留白和不对齐
|
11 years ago |
|
guange
|
3f9abf170e
|
#2363 按天发送邮件相关标题修改
|
11 years ago |
|
sw
|
b6652ed5e5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
10bc470dcf
|
修改课程讨论区
|
11 years ago |
|
huang
|
e38639665b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
7e7ff92f7c
|
issueenter键不能搜索的问题
|
11 years ago |
|
huang
|
4c1259ff92
|
缺陷enter键盘不能搜索（未完成）
|
11 years ago |
|
sw
|
4224e11b52
|
课程讨论区标题换行
|
11 years ago |
|
sw
|
66057b5b4f
|
编辑帖子时的样式
|
11 years ago |
|
whimlex
|
b5781ac22b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
5d0d9de6e8
|
意见反馈各主页内保持一致
|
11 years ago |
|
huang
|
6a19ac4098
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
4da77d8a71
|
wiki页面显示
|
11 years ago |
|
sw
|
12e65ad61f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
c9bfe00a4f
|
修改成员列表的排列
版本库页面色系
|
11 years ago |
|
sw
|
75504139c9
|
删除课程留言时留言数自动刷新
|
11 years ago |
|
sw
|
cfe0635804
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
de23c3c2a8
|
配置中子页面调整
隔行换色显示
显示页面左对齐
|
11 years ago |
|
sw
|
b1e31ded0e
|
修改公共贴吧样式
|
11 years ago |
|
sw
|
7cd54f07cb
|
我要反馈按钮移位
|
11 years ago |
|
sw
|
6d058940ec
|
当课程没有讨论区时自动创建其讨论区
|
11 years ago |
|
sw
|
5b5423b8c5
|
修改贴吧新建帖子、回复显示样式的问题
|
11 years ago |
|
sw
|
1f7f1eff1a
|
课程添加成员输入空格键会搜索出所有任务
|
11 years ago |
|
huang
|
ee1c53bacc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
2070d69d44
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
348eae5c45
|
修改项目模式提示样式
版本库
版本
|
11 years ago |
|
whimlex
|
19fe973b5b
|
上传头像
|
11 years ago |
|
whimlex
|
d66af82478
|
新建竞赛页面日历插件显示错误
|
11 years ago |
|
huang
|
0484692b47
|
缺陷显示页面虚线多余
|
11 years ago |
|
sw
|
9a07989917
|
调整header的login的样式
|
11 years ago |
|
huang
|
425f8473b4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
681546b860
|
缺陷上传附件显示
项目邮件邀（未完成，需切换分支）
|
11 years ago |
|
sw
|
1985d1c84b
|
调整header下啦列表框位置
|
11 years ago |
|
sw
|
427f26b058
|
header的login显示
|
11 years ago |
|
whimlex
|
36f2643ad8
|
上传logo
|
11 years ago |
|
whimlex
|
7ec060cc46
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
4cb22f2437
|
课程、项目、个人头像上传
|
11 years ago |
|
sw
|
de192761b8
|
Merge branch 'szzh' into guange_dev
Conflicts:
Gemfile
config/application.rb
|
11 years ago |
|
whimlex
|
86bd708c5d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
21f08830df
|
意见反馈功能修改
|
11 years ago |
|
sw
|
1cced5d7e6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
sw
|
2f2d4257c2
|
调整提交作业按钮样式
|
11 years ago |
|
huang
|
9cfcbc5584
|
项目讨论区--未登录情况下提示界面
|
11 years ago |
|
huang
|
bce1006969
|
邀请界面添加权限控制
|
11 years ago |
|
huang
|
eeaa613c9e
|
项目类型实时刷新功能
|
11 years ago |
|
huang
|
154ee9f38b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
2f021aecee
|
项目成员列表添加角色。用户得分
|
11 years ago |
|
guange
|
d2dd77612b
|
将登录默认值改为自动登录
|
11 years ago |
|
sw
|
09c51d1a87
|
修改创建作业未启用匿评时，所有作业列表看不到
|
11 years ago |
|
sw
|
83796bfaa0
|
去掉puts
|
11 years ago |
|
sw
|
d279881daf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/courses/settings.html.erb
|
11 years ago |
|
sw
|
7b3edb59b0
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
public/javascripts/course.js
|
11 years ago |
|
sw
|
3d8ec17bb1
|
修改学生作业得分列表弹出框样式
|
11 years ago |
|
huang
|
49f33dd50c
|
类型bug修复
|
11 years ago |
|
huang
|
249c02efff
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
be5c7ac6dd
|
修改项目类型术语
图标
|
11 years ago |
|
whimlex
|
0f037e78fa
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
public/stylesheets/public.css
|
11 years ago |
|
whimlex
|
5123ca1047
|
版本库样式调整
|
11 years ago |
|
huang
|
ee4cfb9c89
|
修改流程碑点进去样式
|
11 years ago |
|
sw
|
5385f35aff
|
教师列表删除翻页
|
11 years ago |
|
huang
|
ca26b0d819
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
app/views/users/show.html.erb
public/javascripts/course.js
|
11 years ago |
|
huang
|
729d11ebaf
|
修复项目配置中首页显示问题
|
11 years ago |
|
huang
|
8b77079f44
|
公开。私有标识强制不换行
|
11 years ago |
|
sw
|
57193b077e
|
作品列表取消分页显示
|
11 years ago |
|
huang
|
7c91a40e4f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
1fe35fc063
|
配置中添加角色权限判断
不同角色通过admin配置显示不同模块
|
11 years ago |
|
whimlex
|
51aeb40d31
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
6441d298a2
|
版本库修订SVG图样式修改
|
11 years ago |
|
whimlex
|
9fa3d25e3f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
b99f8d8056
|
上传头像，上传课程项目logo提示
|
11 years ago |
|
lizanle
|
d6527f1f7e
|
去掉学生列表分页
|
11 years ago |
|
lizanle
|
da7528c780
|
重定向到项目配置里的新建版本页面
|
11 years ago |
|
whimlex
|
0d26f64afd
|
搜索课程——授课时间”与“课程简介”显示异常
|
11 years ago |
|
huang
|
2043b963c8
|
添加意见反馈
项目配置权限
|
11 years ago |
|
whimlex
|
ab93d19b56
|
动态中显示更新项目缺陷样式异常
|
11 years ago |
|
huang
|
861469e39f
|
1、修改回复帖子和新建帖子标题冲突
2、对齐新建框
3、版本库新建按钮样式
|
11 years ago |
|
huang
|
86027e077f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
5bfef259de
|
去掉缺陷列表空白处的链接
|
11 years ago |
|
whimlex
|
84d7e63d54
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
6195f0a150
|
课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断
|
11 years ago |
|
huang
|
c510f14edb
|
流程碑添加新建版本
|
11 years ago |
|
huang
|
2521e802bf
|
缺陷统计添加冒号
|
11 years ago |
|
huang
|
b6f34045db
|
修改缺陷：缺陷上传附件后，第一条回复中会显示附件。
|
11 years ago |
|
huang
|
5c2fdf7aee
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
dd25cdc065
|
1、修改项目三种类型术语
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
|
11 years ago |
|
lizanle
|
457b86a861
|
版本配置
|
11 years ago |
|
lizanle
|
2987253303
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
3b70ab964d
|
issue过滤
|
11 years ago |
|
huang
|
4cddb214fd
|
修改资源库站内搜索不能搜索的bug
|
11 years ago |
|
huang
|
3bd4f2d0f6
|
修改资源库样式
|
11 years ago |
|
huang
|
692500af2e
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
93e3247685
|
项目名称不能为空提示
|
11 years ago |
|
alanlong9278
|
0668af4f89
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/bids/_bid_homework_show.html.erb
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
whimlex
|
86ef3e680a
|
项目简介展开更多信息不超过一定内容不显示
|
11 years ago |
|
huang
|
8dd0e985a0
|
完成
|
11 years ago |
|
whimlex
|
05712c4c06
|
学生作业改为作品
|
11 years ago |
|
whimlex
|
ab39d54b45
|
版本库文件列表样式
|
11 years ago |
|
sw
|
6df1f55ac4
|
添加课程成员后不自动刷新
|
11 years ago |
|
sw
|
d5e71e9803
|
增加课程成员收索功能后、添加课程成员，成员列表不自动刷新
|
11 years ago |
|
huang
|
7340ef793c
|
修改新建项目的显示样式
|
11 years ago |
|
whimlex
|
65e6b41d91
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
22a4bf9216
|
查看修订样式
|
11 years ago |
|
huang
|
7d87915413
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/homework_attach/_homework.html.erb
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
11 years ago |
|
whimlex
|
92bf340786
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
af28461cf0
|
动态中创建项目样式调整
|
11 years ago |
|
lizanle
|
17838acddb
|
提示信息数组 flatten
|
11 years ago |
|
lizanle
|
0ca96a5500
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
ade32aae02
|
列宽修改
|
11 years ago |
|
sw
|
3a8bfbf880
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
lizanle
|
3c17492901
|
列宽
|
11 years ago |
|
sw
|
7239f6a641
|
1、成员列表分页空间翻页不可用
2、当五输入时显示，无用户显示
|
11 years ago |
|
lizanle
|
17f9ed52ce
|
Wiki列宽度
|
11 years ago |
|
lizanle
|
15e54dd765
|
版本 输入名字不能为空
|
11 years ago |
|
lizanle
|
b6db00643e
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
532a8cb5c3
|
返回的时候展开输入框
|
11 years ago |
|
whimlex
|
1382f9a0cd
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
dc955c7e2d
|
编辑问题时，编辑问题状态，开始时间、计划完成时间右侧的时间选择器不见了
|
11 years ago |
|
sw
|
9814a859c3
|
项目添加TAG页面不刷新
|
11 years ago |
|
huang
|
14a0d885f0
|
settings
|
11 years ago |
|
huang
|
04af919c77
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
fc8dacbd5f
|
引入资源列表界面调整
|
11 years ago |
|
lizanle
|
f8951c0044
|
国际化
|
11 years ago |
|
lizanle
|
5e8848f962
|
国际化
|
11 years ago |
|
lizanle
|
42b798e111
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
3620cd99b6
|
去掉错误的符号
|
11 years ago |
|
sw
|
cdbe95f6ec
|
修改老师配置界面成员搜索
|
11 years ago |
|
huang
|
0607cf326c
|
版本库里面页面验证
|
11 years ago |
|
whimlex
|
7e0120e029
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
917701f09d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
c2c9660a46
|
项目得分界面调整
|
11 years ago |
|
whimlex
|
51e0217eb8
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
eb1f8acbd3
|
版本库样式修改
|
11 years ago |
|
lizanle
|
8290741746
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
d2b0eae119
|
格式修改
|
11 years ago |
|
sw
|
9f862ad7a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
1ffa447767
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
640f6a1ca7
|
邮件发送框距离
去掉讨论区不必要的*
|
11 years ago |
|
lizanle
|
1902d557c0
|
有日期label
|
11 years ago |
|
lizanle
|
43442d6f62
|
字符截断
|
11 years ago |
|
lizanle
|
8cee159cb7
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
e4abc86093
|
版本和版本库bug修改
|
11 years ago |
|
huang
|
1961768031
|
新建问题前去掉不必要的*
去掉跟踪功能
|
11 years ago |
|
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
11 years ago |
|
huang
|
f1e86ace25
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
54b81bdfb3
|
项目类型图标
|
11 years ago |
|
whimlex
|
54e63cf4d9
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/issues/_history.html.erb
public/stylesheets/project.css
|
11 years ago |
|
huang
|
258a023abd
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
fec0a7472d
|
新闻换行处理
|
11 years ago |
|
huang
|
fbcd9f9a96
|
wiki页面调整
|
11 years ago |
|
huang
|
0ea683e1b4
|
修改issue中图片附件的缩略图显示方式
|
11 years ago |
|
whimlex
|
8633ba3325
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
8babe384fd
|
缺陷历史记录调整
|
11 years ago |
|
huang
|
d1e7777040
|
关注列表样式
|
11 years ago |
|
huang
|
63a457674a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
440eb8dc7f
|
1、修改项目成员一排显示
2、项目动态显示强制换行
3、讨论区提示用语
|
11 years ago |
|
whimlex
|
fc106fef49
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
fb06571918
|
项目讨论区引用强制换行
|
11 years ago |
|
whimlex
|
e9cf61e0f4
|
缺陷状态根据完成度调整
|
11 years ago |
|
huang
|
ce5b2d9996
|
项目讨论区回复按钮
|
11 years ago |
 z9hang
|
47e6d5c909
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
8a26fd4343
|
课程配置：成员配置处添加搜素成员功能
|
11 years ago |
|
sw
|
daef2c455a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
57a5191fe5
|
课程资源列表样式调整
|
11 years ago |
|
whimlex
|
8b89110e41
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
65bcaef911
|
修改TAG云样式
|
11 years ago |
|
whimlex
|
ca1e902a8f
|
#2279 搜索课程进入结果页面，如图，建议将“授课时间”与“课程简介”与上面的“课程名称”等信息对齐
|
11 years ago |
|
huang
|
c852e72e36
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
611952eb05
|
新建项目时候设定默认项目类型
新建项目样式异常调整
|
11 years ago |
|
sw
|
a0c6a09e7d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
sw
|
332a9b45fb
|
修改项目上传资源弹框样式
|
11 years ago |
|
huang
|
be97e4732d
|
目标版本为空的不显示
|
11 years ago |
|
sw
|
9819e1ce45
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
lizanle
|
61a938ef39
|
添加真名
|
11 years ago |
|
lizanle
|
e4597f9ccc
|
添加真名
|
11 years ago |
|
lizanle
|
45d5f9e58b
|
课程搜索按时间倒序排序
|
11 years ago |
|
huang
|
bfc83d1a8c
|
解决项目图片不能上传
|
11 years ago |
|
sw
|
6983764c44
|
修改课程名称过长时的样式
|
11 years ago |
|
huang
|
9fa7b04ce5
|
组织不需要必填
|
11 years ago |
|
huang
|
b92767bbb5
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
b80251a247
|
链接空白处改成不能点击
修复项目标题过长，布局变形
|
11 years ago |
|
lizanle
|
9621c35e8b
|
项目 版本 和 版本库 标签改动
|
11 years ago |
|
sw
|
05c74960a8
|
1、增加当前选择的TAG云的样式
2、当选择TAG云过滤之后，对TAG进行添加、删除操作时继续选中该TAG
|
11 years ago |
|
lizanle
|
10bd7c2855
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
11 years ago |
|
huang
|
3c563eaecb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
bb7904b32f
|
引入JS文件
|
11 years ago |
|
whimlex
|
19cbc34b2b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
19dd5a9879
|
项目邀请功能和项目更多功能点击事件
|
11 years ago |
|
sw
|
5649f4c5a1
|
过滤之后现在所有的TAG云
|
11 years ago |
|
huang
|
890f36a2d5
|
优化缺陷
|
11 years ago |
|
sw
|
a2b529b38b
|
课程添加TAG后删除TAG按钮消失
|
11 years ago |
|
sw
|
b7e9442800
|
添加、删除TAG云时TAG云列表刷新
|
11 years ago |
|
huang
|
4afd9afd08
|
解决冲突。修改版本页面
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
public/stylesheets/project.css
|
11 years ago |
|
huang
|
08fb04aff4
|
修改版本库样式
|
11 years ago |
|
whimlex
|
20b17f5503
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
301e44c695
|
修改附件上传功能无效
|
11 years ago |
|
huang
|
8803942a02
|
项目讨论区，引用样式调整
|
11 years ago |
|
huang
|
e34a00f66e
|
讨论区列表样式冲突
|
11 years ago |
|
sw
|
e334dd69f8
|
上传课件后TAG云消失
|
11 years ago |
|
huang
|
c1d997379f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
lizanle
|
a4d6eaa46c
|
跳转回来自动选择tab页
|
11 years ago |
|
huang
|
284e4938f6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
lizanle
|
38672458b0
|
新建版本 更改页面
|
11 years ago |
|
huang
|
dc81db1d8b
|
处理讨论区、缺陷列表样式显示异常
|
11 years ago |
|
sw
|
2db3ab9d13
|
修改课程时增加密码与课时的验证
|
11 years ago |
|
lizanle
|
86b05b8e6a
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
fe94efeb39
|
新建版本更改页面
|
11 years ago |
|
sw
|
94ca6cd2f9
|
新建课程时增加密码与课时的验证
|
11 years ago |
|
huang
|
e2f7da5b99
|
修改里程碑代码
|
11 years ago |
|
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
11 years ago |
|
huang
|
bd800a53e4
|
项目简介显示
|
11 years ago |
|
whimlex
|
7ce8ae0261
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
9c07976751
|
展开和收起更多信息图片样式修改；跟踪者样式修改
|
11 years ago |
|
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
11 years ago |
|
huang
|
bc6ff57de2
|
修改开发组、朋友圈、研发组切换js
|
11 years ago |
|
huang
|
61ce44af76
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
c11fdc7273
|
版本库调整：未完成
|
11 years ago |
|
whimlex
|
1d8dee15f4
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
04698c3e53
|
项目描述展开信息和收起信息
|
11 years ago |
|
whimlex
|
d23ac832ca
|
项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整
|
11 years ago |
|
huang
|
fec751608a
|
完成里程碑界面
|
11 years ago |
|
huang
|
8e7b4868ca
|
wiki页面调整
|
11 years ago |
|
huang
|
6229acac71
|
完成wiki新建界面
|
11 years ago |
|
whimlex
|
d79de0a354
|
课程日期控件样式冲突
|
11 years ago |
|
sw
|
94580ba040
|
11
|
11 years ago |
|
whimlex
|
596e89a14f
|
缺陷更新页面
|
11 years ago |
|
sw
|
0cc809c3e0
|
实现课程资源TAG云功能
|
11 years ago |
|
huang
|
45c234bf9c
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
aff58dd3a7
|
添加关注者
|
11 years ago |
|
sw
|
73ed8b9558
|
全站搜索是不输入条件搜索结果为空
|
11 years ago |
|
sw
|
0f6d2676e5
|
tag云显示搜索结果的TAG云
|
11 years ago |
|
whimlex
|
30dae089c6
|
新建缺陷页面主题不能为空
|
11 years ago |
|
whimlex
|
521e000c74
|
commmit
|
11 years ago |
|
sw
|
2e3294a341
|
1、增加根据资源列表，获取其TAG与每个TAG数量的hash的方法
2、增加课程资源列表的TAG云的显示
|
11 years ago |
|
whimlex
|
d68b0283eb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
a10ced61ec
|
缺陷跟踪者
|
11 years ago |
|
huang
|
3825252327
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
104075b3fd
|
修改缺陷留言方式
|
11 years ago |
|
whimlex
|
7fa2338ce6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
ba0535e127
|
完成新建缺陷页面
|
11 years ago |
|
sw
|
676cf8f180
|
课程上传资源是根据上传的类型，对资源添加默认的TAG
|
11 years ago |
|
huang
|
4d0a9bd35c
|
部分描述增加强制换行
|
11 years ago |
|
huang
|
0023d0610b
|
缺陷主题、描述强制换行
跟踪按钮样式
引用样式修改
|
11 years ago |
|
sw
|
1dc8190aa0
|
1、修改无跳转的href链接为javascript:void(0)
2、增加课程资源库的界面
|
11 years ago |
|
sw
|
e579157604
|
更新public.css
课程讨论区文件按钮和editor靠的太近
|
11 years ago |
|
huang
|
c607bd5cbf
|
定义缺陷中样式
|
11 years ago |
|
alanlong9278
|
b704555628
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
.gitignore
Gemfile
app/controllers/discuss_demos_controller.rb
app/models/user.rb
app/views/bids/_bid_homework_show.html.erb
app/views/issues/index.html.erb
app/views/layouts/_base_feedback.html.erb
app/views/poll/publish_poll.js.erb
app/views/poll/republish_poll.js.erb
public/javascripts/application.js
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
alanlong9278
|
a51ba0c104
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
11 years ago |
|
huang
|
afa5c3a4f9
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
bfe0176b74
|
修改附件显示样式
|
11 years ago |
|
lizanle
|
c42a63ea4e
|
添加判空
|
11 years ago |
|
lizanle
|
c2ccf6a1f8
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
a7f1026828
|
current_user判空
|
11 years ago |
|
sw
|
7dbd20e5eb
|
修复刷新页面时只评论未评分表的作品在已评列表中
|
11 years ago |
|
sw
|
61df6e144d
|
修复学生作业列表QQ浏览器显示超出边框
|
11 years ago |
|
sw
|
d1f42a3954
|
教师只评论不评分的作品在未批和已批列表中都有
|
11 years ago |
|
sw
|
78dff36d7a
|
老师只评论不评分的学生作业却在已评列表
|
11 years ago |
|
sw
|
ee68828132
|
创建课程后跳转URL报错
|
11 years ago |
|
huang
|
4acad8088e
|
缺陷最新显示最上面
代码优化
|
11 years ago |
|
huang
|
e0695fa51d
|
讨论区。描述、主题换行
|
11 years ago |
|
huang
|
b7537ad518
|
修改新闻中测出的bug，
讨论区中附件显示形式
|
11 years ago |
|
whimlex
|
b3b9688072
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
cdf1ce1c17
|
缺陷页面
|
11 years ago |
|
sw
|
81cbb76d78
|
课程/项目--添加成员：用真实姓名搜索用户时，需要在姓和名之间加个空格才可以搜到
|
11 years ago |
|
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
11 years ago |
|
sw
|
c60515ac50
|
学生作业增加按学生真实姓名、昵称、学号搜索功能
|
11 years ago |
|
sw
|
e4b2092c7f
|
实现项目成员列表增加成员，以及用户/角色留空时的提示信息
|
11 years ago |
|
sw
|
bb9513b313
|
课程学生作业列表增加搜索的静态页面
|
11 years ago |
|
huang
|
729b28ae43
|
修改项目创始人不能删除自己
|
11 years ago |
|
huang
|
5ae5cfda03
|
项目配置添加申请加入
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
|
11 years ago |
|
sw
|
1598bf6b4d
|
课程成员搜索忽略大小写
|
11 years ago |
|
huang
|
b3689377a3
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
b98a67f50d
|
完成项目配置-成员模块
|
11 years ago |
|
sw
|
679620fa51
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
sw
|
8c122a35f7
|
项目类型切换到其他类型后，再切回开发组，更多按钮不可用
|
11 years ago |
|
huang
|
b3c3693d72
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
845794675a
|
配置-成员界面休整
|
11 years ago |
|
sw
|
aee81e8e44
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/layouts/base_projects.html.erb
|
11 years ago |
|
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
11 years ago |
|
huang
|
6b8022cb23
|
清除不需要的子模块
|
11 years ago |
|
huang
|
f3ba393bd4
|
去掉代码审查
修改配置-“版本库”样式
|
11 years ago |
|
huang
|
48f096178c
|
修改配置modoule模块
|
11 years ago |
|
huang
|
2b063db0cc
|
修改版本界面
未完成部分，隔行换色
|
11 years ago |
|
whimlex
|
cf4451e998
|
pre标签换行；contest主页样式调整
|
11 years ago |
|
huang
|
6ce998bb54
|
去掉新版本库中冗余代码
|
11 years ago |
|
huang
|
5d249823df
|
修改配置版本库页面
|
11 years ago |
|
sw
|
39579331e7
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
sw
|
01f56a761f
|
完成配置---模块
|
11 years ago |
|
whimlex
|
5c96a5322a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
1d8c2d2a3a
|
commit
|
11 years ago |
|
sw
|
fb935f124c
|
完成修改项目界面
|
11 years ago |
|
huang
|
534bd46008
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
36d76cfa07
|
缺陷列表代码整理
|
11 years ago |
|
sw
|
b19bfa5c0a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
sw
|
7ad3c2d578
|
修改项目配置js
增加项目配置相关子界面
|
11 years ago |
|
lizanle
|
76d7bd267c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
68a54b9368
|
app评论
|
11 years ago |
|
huang
|
d2a77b3d41
|
添加issues回复统计
|
11 years ago |
|
sw
|
7b60998952
|
修改点击课程名称，url连接错误
|
11 years ago |
|
huang
|
78868b34f0
|
修改缺陷中四中颜色按钮会折断换行的bug
区别新闻和通知
|
11 years ago |
|
sw
|
44cb4a8e56
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
4adfec5640
|
解决样式冲突
添加新闻展示页面
|
11 years ago |
|
huang
|
e3d815b51d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
0c90f2361d
|
项目用户反馈页面调整
|
11 years ago |
|
sw
|
837fe88545
|
还原冲突，增加项目配置切换js
|
11 years ago |
|
whimlex
|
ccff6c27b0
|
#2170项目--新闻：评论新闻返回异常undefined method `split' for nil:NilClass
|
11 years ago |
|
whimlex
|
f79132e9be
|
项目新闻评论不显示无评论的查看
|
11 years ago |
|
whimlex
|
7e46885f3d
|
修改上传附件数目限制
|
11 years ago |
|
sw
|
db0cc88142
|
静态页面添加
|
11 years ago |
|
whimlex
|
5936d8d8e9
|
评论显示
|
11 years ago |
|
huang
|
8f6b095fdb
|
新闻页面调整
|
11 years ago |
|
whimlex
|
23a6408c9f
|
评论数为0时不显示“查看所有评论”
|
11 years ago |
|
sw
|
1c19114252
|
去掉发布竞赛的权限判断
|
11 years ago |
|
guange
|
8454e56ff4
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
123fa079b3
|
smtp配置放入production
|
11 years ago |
|
huang
|
7577f4cbbc
|
项目缺陷显示页面样式调整
|
11 years ago |
|
whimlex
|
0427032cbe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
874dcc2b89
|
附件上传国际化调整
|
11 years ago |
|
huang
|
33abbaffe1
|
修改isuue显示界面
附件显示形式
国际化
部分样式调整
|
11 years ago |
|
sw
|
434415343c
|
课程留言图片显示问题
|
11 years ago |
|
sw
|
b2b3aeb20b
|
课程讨论区评论图片问题
|
11 years ago |
|
whimlex
|
e148917865
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
69153d2d95
|
项目界面缺失翻译调整
|
11 years ago |
|
lizanle
|
e595f1d445
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
b3b0461a42
|
已经被关注的人就不显示
|
11 years ago |
|
sw
|
858a54267f
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
ece4a67f97
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
d99910e8a1
|
个人动态列表留言动态url错误
|
11 years ago |
|
guange
|
a344fcdfc7
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
f94184bc81
|
个人动态权限部分性能优化
|
11 years ago |
|
sw
|
f0ba408a10
|
课程通知、个人动态 大图片超出页面
|
11 years ago |
|
sw
|
600003e48c
|
公共贴吧中使用新编辑器上传大图片，图片超出界面
|
11 years ago |
|
sw
|
400d1a147d
|
课程新编辑器导致图片超出页面
|
11 years ago |
|
sw
|
ea0bd7e0dd
|
1、技术支持只有白羽
2、修改鼠标悬浮在白羽上有下划线
|
11 years ago |
|
sw
|
596bc213ca
|
1、课程导航懒点击课程跳到动态页面
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
|
11 years ago |
|
sw
|
6b758375f8
|
1、搜索课程报500
2、课程讨论区描述换行显示
|
11 years ago |
|
sw
|
9ebed65fde
|
课程动态：作业动态url不对
|
11 years ago |
|
lizanle
|
db219205d9
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
fc66050413
|
注册失败，提示中英文混合
|
11 years ago |
|
whimlex
|
1fae44b201
|
用户主页国际化修改
|
11 years ago |
|
whimlex
|
2a35e771c2
|
项目界面国际化及样式调整；标签模块国际化及样式调整
|
11 years ago |
|
sw
|
eca32ca625
|
课程资源库标签搜索不正确
|
11 years ago |
|
guange
|
c489d2400b
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
5a876d9df1
|
邮件发送时，单个收件人会报错
|
11 years ago |
|
huang
|
287c767c86
|
缺陷页面样式调整
|
11 years ago |
|
whimlex
|
9ef212b6d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
bcf83328f2
|
项目界面国际化
|
11 years ago |
|
huang
|
f2cf46f0a0
|
修改缺陷列表显示bug
|
11 years ago |
|
huang
|
fe7646c764
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
11 years ago |
|
whimlex
|
85400616f1
|
新建缺陷页面
|
11 years ago |
|
lizanle
|
2fc285699e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
5562456a85
|
学生提问数的修改
|
11 years ago |
|
lizanle
|
523e56c1db
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
d0562f1ede
|
编辑课程的时候如果没有输密码，那就用原来的密码
|
11 years ago |
|
sw
|
5ad1028c49
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
7303253c07
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
b8760c6403
|
个人描述最长为200
|
11 years ago |
|
whimlex
|
3b84b0417a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
e030c12be8
|
课程动态计数和显示统一；问卷计数对学生和老师和显示统一；课程资源库排序
|
11 years ago |
|
sw
|
dbc7c7a5c6
|
2846 公共贴吧没有最后回复人就不显示最后回复
|
11 years ago |
|
sw
|
4fbbd7ceb7
|
公共贴吧，描述显示问题
|
11 years ago |
|
sw
|
0743ac2c78
|
课程成员配置-添加成员：没有搜索条件则显示空
|
11 years ago |
|
sw
|
6abdc4c7e1
|
课程成员配置界面，显示学生真实姓名，无真实姓名的蔡先生login
|
11 years ago |
|
huang
|
95a1c1fe62
|
版本库显示页面调整，分页样式调整
|
11 years ago |
|
sw
|
4b83296a97
|
课程作业列表开启、关闭匿评
|
11 years ago |
|
sw
|
503d1fc2ee
|
开启匿评、关闭匿评js
|
11 years ago |
|
huang
|
c8f9add566
|
修改项目成员邀请界面（添加按钮点击搜索）
|
11 years ago |
|
sw
|
a737342a66
|
完成个人信息下拉、首页下标的隐藏非项目信息的定制
|
11 years ago |
|
sw
|
78b60efbbe
|
导航栏根据配置信息确定是否显示非项目连接
|
11 years ago |
|
sw
|
988f8b7918
|
增加隐藏非项目信息按钮以及路由
实现点击按钮事数据的存储与修改
修改配置文件
|
11 years ago |
|
huang
|
4d4e1cac8b
|
完成新的邮件邀请界面
|
11 years ago |
|
huang
|
45a03bac1b
|
缺陷列表新增四种类型样式
|
11 years ago |
|
huang
|
45fa01c773
|
修改缺陷不能显示的bug
|
11 years ago |
|
guange
|
0325554d24
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
huang
|
b415575e0e
|
修改新缺陷列表
完成部分项目配置
|
11 years ago |
|
lizanle
|
a04122bb8e
|
提示改为中文 2903
|
11 years ago |
|
lizanle
|
d1b5d28ff0
|
2901 工作单位不显示
|
11 years ago |
|
lizanle
|
66a7d267c8
|
工作单位不显示 2901
|
11 years ago |
|
lizanle
|
4c11e166f6
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
lizanle
|
6612ae357a
|
提示要为中文
|
11 years ago |
|
sw
|
c399ab2e4f
|
项目新闻 评论内容获取不正确
|
11 years ago |
|
sw
|
d08329631a
|
修复项目讨论区引用显示不正确
|
11 years ago |
|
sw
|
ba743c120b
|
1、课程留言回复框大小
2、课程留言有html代码
|
11 years ago |
|
sw
|
c5b55042d4
|
1、修复课程讨论区引用功能
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
|
11 years ago |
|
sw
|
dae907d0b8
|
1、课程通知无法添加评论
2、课程通知界面显示
3、课程通知评论取消按钮
|
11 years ago |
|
sw
|
663c9aad60
|
1、课程通知列表出现html代码
2、整理课程通知部分js
3、还原编辑器js代码
|
11 years ago |
|
sw
|
d192a564b4
|
课程作业列表、课程动态页面描述出现html标签
|
11 years ago |
|
sw
|
657b022baa
|
修改课程作业显示
|
11 years ago |
|
sw
|
15567e7d7b
|
1、新的编辑起未对其
2、老师新建作业增加marting-bottom
|
11 years ago |
|
guange
|
89af4b451b
|
#2100 IE8中，课程--老师发布作业/学生提交作业，上传附件提交不了
|
11 years ago |
|
huang
|
be07c2c961
|
添加项目关注列表
|
11 years ago |
|
sw
|
ba4894239c
|
1、部分浏览器下新建课程页面密码默认填写，课时默认填写为登录名
2、修改课程密码显示取消明码显示
|
11 years ago |
|
huang
|
d832514a55
|
新增项目成员列表
|
11 years ago |
|
huang
|
bf36da8dcb
|
修改醒目新闻新建页面
退出项目样式
|
11 years ago |
|
sw
|
cc6a9d12f1
|
新建课程时显示明码按钮样式
|
11 years ago |
|
sw
|
235ba23a62
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
217f62f373
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
8b379711d9
|
1、修改附件列表排列和样式
2、谈论区样式显示
3、讨论区：“编辑” “引用”， “回复”
4、讨论区与课程分离
|
11 years ago |
|
lizanle
|
60838460fc
|
课程的创建动态也要显示
|
11 years ago |
|
huang
|
c1fea1c7e2
|
课程资源新界面
项目动态分页调整
|
11 years ago |
|
sw
|
3bedddd190
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
11 years ago |
|
huang
|
df43274565
|
新版项目界面（部分未完成，先合并）
1、项目框架整理
2、各页面样式
|
11 years ago |
|
lizanle
|
84c2e39e6c
|
新闻评论出现错误。误将safe_attributes换为直接属性comments
|
11 years ago |
|
sw
|
8e38103bfb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
lizanle
|
5ee732063d
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
