 sw
|
f2325dee88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
1e95d5247d
|
调整标题栏位置
|
10 years ago |
 lizanle
|
b4561fa68d
|
资源库标签 上方的tag重命名的话，所有的含有该tag的资源的那个标签页要重命名
|
10 years ago |
|
sw
|
9d2b58738e
|
分班过滤功能
|
10 years ago |
 huang
|
554b8356ac
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
200861cfef
|
完成issue点对点消息通知
|
10 years ago |
 cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
10 years ago |
|
sw
|
90536efa1e
|
课程内姓名学号邮箱过滤，各种排序 改为js刷新页面
|
10 years ago |
|
sw
|
2d48161928
|
新版作品列表界面
|
10 years ago |
 ouyangxuhua
|
752dc34a5f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
e295c74a91
|
项目问题留言中，当留言内容为空（blank）时，不显示
|
10 years ago |
|
cxt
|
83e2a4b5bd
|
新建问卷页面添加问卷描述提示文字
|
10 years ago |
|
huang
|
48b93f2113
|
项目缺陷消息点对点发送
回复逻辑优化（未完成）
|
10 years ago |
|
sw
|
7a62b7f13d
|
增加匿评开启时间和匿评关闭时间，并对其业务逻辑进行js的控制。以及这两个值得修改
|
10 years ago |
|
lizanle
|
7624b917f0
|
添加标签 要限制长度
|
10 years ago |
|
lizanle
|
9f97dc5739
|
修改标签 要限制长度
|
10 years ago |
|
cxt
|
facd12640a
|
个人动态的回复为0时不显示“回复(0)”
|
10 years ago |
|
cxt
|
7c8f0decc6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
9be7e633ae
|
动态回复框的样式调整
|
10 years ago |
|
lizanle
|
27a4954612
|
添加标签 要限制长度
|
10 years ago |
|
lizanle
|
e81d8f83a5
|
添加标签 要限制长度
|
10 years ago |
|
huang
|
b49d19cdb2
|
添加注释
|
10 years ago |
|
lizanle
|
553c1396dd
|
帖子创建不成功 给出原因
帖子发布时长度检查
|
10 years ago |
|
huang
|
d9620e416e
|
优化“全部设为已读” 代码
|
10 years ago |
|
huang
|
6e9db8b922
|
封装点击按钮时间
|
10 years ago |
|
huang
|
b70104cee8
|
完整mail.text
|
10 years ago |
|
huang
|
70357683f7
|
用户申请加入项目邮件界面
|
10 years ago |
|
huang
|
fb034090d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/users/user_messages.html.erb
解决冲突
|
10 years ago |
|
huang
|
14acdef0cb
|
消息列表中增加权限判断
|
10 years ago |
|
lizanle
|
a24ca05157
|
贴吧的描述修改的图标 和 删除标签的图片的显示隐藏问题
|
10 years ago |
|
lizanle
|
a958a879ad
|
贴吧创建不成功的时候应该给个错误提示
|
10 years ago |
|
lizanle
|
52b4cba582
|
贴吧名称 和描述输入的时候自适应高度
|
10 years ago |
guange
|
8ab08ea30f
|
Merge remote-tracking branch 'origin/szzh' into guange_homework
|
10 years ago |
|
guange
|
b6240127a9
|
对编程框进行代码着色
|
10 years ago |
|
sw
|
6dab5ef34c
|
Merge branch 'develop' into szzh
|
10 years ago |
|
sw
|
df41414cf7
|
1、个人动态、作业列表、课程内作业列表编程语言显示不正确
|
10 years ago |
|
huang
|
b207c231f7
|
1、消息“同意加入”添加权限控制，项目成员不显示
2、区别项目成员和非项目成员的不同样式
3、访问项目和成员列表--则设置项目邀请消息为已读
|
10 years ago |
|
lizanle
|
67fe8de897
|
贴吧不能新建成功的时候 也没有给出任何提示
|
10 years ago |
|
lizanle
|
11714868b7
|
贴吧不能新建成功的时候 也没有给出任何提示
|
10 years ago |
|
sw
|
b623894976
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
0300cbe319
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
f4d11f8844
|
修改系统消息页面中，图片大小显示问题
|
10 years ago |
|
sw
|
ccd19021ae
|
课程动态回复之后，编辑器变宽
|
10 years ago |
|
lizanle
|
cddb3deb35
|
贴吧不能新建成功的时候 也没有给出任何提示
|
10 years ago |
|
huang
|
42745092c5
|
设置权限，其他人不能访问我的消息列表
|
10 years ago |
|
lizanle
|
604e7ca56d
|
贴吧不能新建成功的时候 也没有给出任何提示
|
10 years ago |
|
lizanle
|
acbbd0d7be
|
贴吧列表去掉描述2字
|
10 years ago |
|
sw
|
64132de07f
|
test
|
10 years ago |
|
lizanle
|
46c806900e
|
贴吧列表和主题列表 按不同的规则排序的时候，如果翻页了，又回到了综合排序的问题
|
10 years ago |
|
sw
|
d68ade19e1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
bbc14dbe5c
|
课程论坛回复框上信息错误
|
10 years ago |
|
sw
|
fdaa573249
|
动态页面自动增高后编辑框超出阴影区域
|
10 years ago |
|
ouyangxuhua
|
bc964ac931
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
964738f203
|
系统消息的tips中，没有内容就不显示“内容”
|
10 years ago |
|
sw
|
a54a51c984
|
Merge branch 'guange_homework' into szzh
Conflicts:
app/models/homework_detail_programing.rb
db/schema.rb
|
10 years ago |
|
sw
|
2d0bf60bf2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
b9bac42c1a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
098be99b84
|
动态回复框的样式调整
|
10 years ago |
|
huang
|
c8f2430004
|
系统消息每页显示10个
|
10 years ago |
|
sw
|
0a5d1c255a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
f1b1ec12a6
|
问卷的发布、关闭按钮增加tip
|
10 years ago |
|
huang
|
c9bedb2362
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
0fcbbebd36
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
e033a03c7a
|
tips
|
10 years ago |
|
huang
|
70f53a8376
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
961b2bd564
|
开启/关闭匿评邮件通知
|
10 years ago |
|
lizanle
|
543e9711b3
|
创建贴吧后，列巴列表按时间排序
|
10 years ago |
|
sw
|
5313bf0e3d
|
具体课程作业列表中也应该看到编程作业的匿评状态
|
10 years ago |
|
sw
|
7ba27026ae
|
教师在课程内编辑、删除作业之后仍然跳转回当前课程作业列表
|
10 years ago |
|
guange
|
c99222820e
|
加入了python语言支持
|
10 years ago |
|
sw
|
3e57aa1392
|
1、教师可以在动态界面进行答题
2、学生在动态界面看到作业动态显示为提交作品、修改作品
3、动态界面可以看到作业当前所处匿评状态
|
10 years ago |
|
lizanle
|
7b24f9590d
|
编辑贴吧tag的权限问题
|
10 years ago |
|
lizanle
|
ba240c72b7
|
编辑贴吧tag的权限问题
|
10 years ago |
|
ouyangxuhua
|
71794ccffc
|
tips显示主题和内容
|
10 years ago |
|
lizanle
|
fa41c03a82
|
编辑贴吧描述权限问题
|
10 years ago |
|
lizanle
|
72ae07fcb1
|
回复自回复错误
|
10 years ago |
|
lizanle
|
b621449406
|
帖子过滤错误
|
10 years ago |
|
lizanle
|
4655f7a412
|
图标加链接
|
10 years ago |
|
lizanle
|
422e07fa48
|
帖子展示错误
|
10 years ago |
|
lizanle
|
da2b027f04
|
回复错误
|
10 years ago |
|
ouyangxuhua
|
1e97f9224f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
400f394d05
|
tips标题
|
10 years ago |
|
huang
|
32f90ea591
|
"同意加入"只有自己才能看到
|
10 years ago |
|
huang
|
810c0d8fe5
|
作业开启/关闭匿评邮件通知
|
10 years ago |
|
huang
|
fb76bc8f9a
|
完成项目邀请消息通知及对应页面
解决防注入问题（通过随机6为密码）
|
10 years ago |
|
sw
|
05f7bf9634
|
test1
|
10 years ago |
|
sw
|
715dc28187
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
79881f3dca
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
3a4400cfee
|
tips样式
|
10 years ago |
|
huang
|
ff2e3e168d
|
开启/关闭匿评消息通知
|
10 years ago |
|
lizanle
|
9443c139f0
|
update forum
|
10 years ago |
|
huang
|
850a7c937f
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
huang
|
ba2474e480
|
关闭匿评消息
|
10 years ago |
|
sw
|
4061aa8a14
|
提交作品关联项目提示信息
|
10 years ago |
|
sw
|
bb197897b7
|
作品列表enter键搜索，以及提示信息修改
|
10 years ago |
|
sw
|
ec4c7f531d
|
匿评作业成绩计算错误
|
10 years ago |
|
huang
|
c8f7655d1e
|
系统消息样式
|
10 years ago |
|
cxt
|
cacb3e043a
|
动态回复框的焦点前焦点后样式调整
|
10 years ago |
|
sw
|
1d39df5469
|
C改为大写、编程属性设置的修改
|
10 years ago |
|
ouyangxuhua
|
70e8db0ba9
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
e8d6fe1e4b
|
显示系统消息标题
|
10 years ago |
|
huang
|
434e223c86
|
修改标题
|
10 years ago |
|
huang
|
17bf74bdfd
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
cfea5e9c89
|
邀请已注册用户 消息邀请信息
|
10 years ago |
|
ouyangxuhua
|
9c74ff0b34
|
1.系统消息显示主题；
2.系统消息中冒号修改为中文形式
|
10 years ago |
|
cxt
|
20ea692260
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
154cd7de6f
|
子域名的更改
|
10 years ago |
|
sw
|
cf2a00d7a8
|
作业列表增加：编程语言提示，匿评阶段提示
|
10 years ago |
|
huang
|
c3223982cd
|
修改系统消息链接跳转
|
10 years ago |
|
huang
|
81743143c2
|
优化用户留言页面
|
10 years ago |
|
sw
|
9d9ed24d1b
|
111
|
10 years ago |
|
huang
|
90bf4a7c99
|
系统消息样式冲突问题
|
10 years ago |
|
huang
|
f041c80d0a
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/users/user_messages.html.erb
db/schema.rb
public/stylesheets/new_user.css
解决冲突
|
10 years ago |
|
huang
|
bc422dd25e
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
f823046bc3
|
完成课程留言点对点逻辑结构
|
10 years ago |
|
sw
|
281e97e468
|
课程内老师可以对作业进行编辑、删除、开启匿评
|
10 years ago |
|
sw
|
f04e0c5f84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
sw
|
cdc285797e
|
编程作业评分比例设置第一次加载时教辅评分百分比上限设置
|
10 years ago |
|
sw
|
8eb2c75cbc
|
1、编程作业修改评分比例之后成绩计算问题
2、关闭匿评之后样式
|
10 years ago |
|
cxt
|
ad610cb0b2
|
测试集输入输出框的自适应高度
|
10 years ago |
|
ouyangxuhua
|
989d74bf70
|
修改消息tips样式
|
10 years ago |
|
sw
|
859fe01c52
|
1、编程作业无法导出缺评、匿评列表
2、编程作业评分设置初始值
|
10 years ago |
|
sw
|
4b83265508
|
1、编程作业可以修改、删除
2、关闭匿评之后结束匿评按钮样式
3、编程作业成绩计算有问题
4、相关样式修改
5、编程作业作品展开界面功能
|
10 years ago |
|
huang
|
e09cdb2587
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
3b5e7f3012
|
公共贴吧消息样式
|
10 years ago |
|
ouyangxuhua
|
3b49547b37
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
7934b59395
|
增加break_word
|
10 years ago |
|
huang
|
96f1dfd2e5
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
0fead3b801
|
1、课程留言发送对象为老师
2、作业截止时间邮件通知不适用delay_job
3、添加作业截止时间邮件通知界面
|
10 years ago |
|
ouyangxuhua
|
7694a8fd2c
|
所有消息里的系统消息样式
|
10 years ago |
|
sw
|
a8c5d18069
|
1、之前普通作业更改为匿评作业。。。
2、系统评分为null时默认为0
|
10 years ago |
|
sw
|
5bdb1cd461
|
1、启动匿评、关闭匿评时弹出框位置
2、缺评评分设置报错
|
10 years ago |
|
sw
|
7cc5ce92c6
|
完成评分比例设置功能
|
10 years ago |
|
cxt
|
8f317711b8
|
动态回复框高度的自适应
|
10 years ago |
|
ouyangxuhua
|
135359b615
|
取消alert
|
10 years ago |
|
ouyangxuhua
|
6f9c10651c
|
修改系统消息样式
|
10 years ago |
|
cxt
|
c3d0dac319
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
7254cf4689
|
项目缺陷的属性变化时更新动态表中相应缺陷的最后更新时间
|
10 years ago |
|
sw
|
cc7a752623
|
到处附件、缺评、匿评、成绩列表
|
10 years ago |
|
sw
|
b8cb422268
|
排序功能
|
10 years ago |
|
sw
|
9c20368274
|
1、系统评分的时候对成绩进行赋值
2、去掉错误的编程得分计算方法
|
10 years ago |
|
sw
|
f6f3d83c5e
|
1、老师、学生打分
2、评论及评论的回复功能
|
10 years ago |
|
ouyangxuhua
|
43eeb8f457
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
d31b1d99a9
|
修改系统消息样式
|
10 years ago |
|
huang
|
9324d45e2c
|
系统消息发布添加标题功能
|
10 years ago |
 Tim
|
062a9ff231
|
上传头像确定，取消按钮字号大小统一
|
10 years ago |
|
huang
|
d00ad2e14d
|
1、作业截止时间邮件通知
2、系统消息通知路由、方法定义
|
10 years ago |
|
Tim
|
a99d56b2e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
3dccf8f77d
|
动态页面菜单栏图标更改；
提交作业界面图标宽度更改。
|
10 years ago |
|
sw
|
c4abe6b413
|
shou页面的展示以及留言功能
|
10 years ago |
|
cxt
|
68338c46e1
|
个人动态按最后更新时间排序
|
10 years ago |
|
huang
|
7a014e1f79
|
解决bug：自动注册用户时，邮箱名过长超过login限制
解决方法：login长度和邮箱长度同步
|
10 years ago |
|
cxt
|
6c99674798
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
3f7c69e8e1
|
动态的判断
|
10 years ago |
|
huang
|
b943a1de63
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
b9fc410802
|
添加系统消息单独新页面
|
10 years ago |
|
ouyangxuhua
|
d4e1c62989
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
ouyangxuhua
|
99d6012718
|
项目邀请
|
10 years ago |
|
sw
|
47cdf1231d
|
匿评评分，成绩提示框的显示
|
10 years ago |
|
sw
|
53d6c6853d
|
作品列表的显示
|
10 years ago |
|
huang
|
b5f4b1dd96
|
功能：24小时内系统消息显示
|
10 years ago |
|
huang
|
e7fc0ca6d3
|
休整消息样式
|
10 years ago |
|
huang
|
cfcf1f8103
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
7cdebab5e5
|
1、修改系统消息样式
2、解决新注册用户系统消息红点不显示问题
3、调整消息样式
|
10 years ago |
|
ouyangxuhua
|
d21dce566f
|
修改新闻显示的word-break 和 word-wrap
|
10 years ago |
|
sw
|
efdd717c3c
|
成绩计算算法的实现
|
10 years ago |
|
Tim
|
9a735c7157
|
模拟测试提示添加
|
10 years ago |
|
sw
|
3573179403
|
匿评作品列表 标题头没有对齐
|
10 years ago |
|
Tim
|
5612bb47dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
0930815086
|
回复头像模糊效果
|
10 years ago |
|
sw
|
90d70e7c88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
84bb5af86f
|
增加教师优先字段
|
10 years ago |
|
sw
|
1ed1957899
|
教辅评分、系统评分、学生匿评 比例默认设置
|
10 years ago |
|
sw
|
22d4499f8f
|
缺评、迟交扣分还是改为 直接扣多少分
|
10 years ago |
|
cxt
|
036129a622
|
动态回复后的回复框样式不改变
|
10 years ago |
|
sw
|
fa9008d396
|
作品在非匿评阶段的显示
|
10 years ago |
|
sw
|
9a859d28bf
|
增加匿评时作品的显示
|
10 years ago |
|
Tim
|
5b6ac4564a
|
回复框头像路径改变
|
10 years ago |
|
huang
|
94f91a85e6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
67f7fc7de3
|
注释掉“邀请系统注册用户”，因为邀请用户中已经包含该功能
|
10 years ago |
|
ouyangxuhua
|
1476489921
|
增加鼠标经过提示title
|
10 years ago |
|
huang
|
d602e62119
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
c9d52571f0
|
1、项目邀请中添加两种特殊情况的判断。
2、完成邀请状态列表界面。
3、优化之前的邀请状态逻辑。
|
10 years ago |
|
Tim
|
3d5f93b938
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_course_news.html.erb
app/views/users/_project_issue.html.erb
app/views/users/_project_message.html.erb
app/views/users/_user_activities.html.erb
public/stylesheets/new_user.css
|
10 years ago |
|
sw
|
939a010adb
|
静态页面添加
|
10 years ago |
|
cxt
|
3bdab22aca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
a184ab4b69
|
个人动态首页只显示第一个动态的回复框，其它的需点击才显示
|
10 years ago |
|
ouyangxuhua
|
e2024716e9
|
显示问题差别的html样式
|
10 years ago |
|
sw
|
c21cea85f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
30e703b9bf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
cxt
|
a714b10860
|
阻止配置课程、加入课程、新建课程、新建项目版本、新建版本库等页面输入框的自动填充
|
10 years ago |
|
ouyangxuhua
|
99b300b225
|
问题对比显示
|
10 years ago |
|
ouyangxuhua
|
e463be04c3
|
课程留言更新
|
10 years ago |
|
ouyangxuhua
|
5155e8794f
|
将课程留言加入消息队列
|
10 years ago |
|
huang
|
b43acd3a46
|
邀请用户加入项目：
特殊情况：用户登录名=邮箱名，用户修改邮箱，此时将用户作为条件邀请
|
10 years ago |
|
huang
|
78ca55f121
|
优化邮件邀请策略
|
10 years ago |
|
sw
|
5f08ecc7e3
|
1、作业的开启匿评、关闭匿评功能
2、提交作品时，迟交扣分、缺评扣分的计算--->改为只计算数量
3、
|
10 years ago |
|
Tim
|
77a8c18a77
|
1.关于我们样式修改；
2.登录界面格式调整；
3.个人动态回复样式调整；
|
10 years ago |
|
sw
|
4a959523c1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
3edeb81ba5
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
