 cxt
|
44ce4fe592
|
多次点击留言不会重复提交
|
10 years ago |
guange
|
4f57e48b92
|
merge
|
10 years ago |
|
guange
|
d1315e35b5
|
merge
|
10 years ago |
|
guange
|
f61f639af2
|
转换为remote js
|
10 years ago |
 huang
|
b981f3dcea
|
修复项目删除403问题
课程回复的时候不显示删除按钮
|
10 years ago |
|
huang
|
75fecc0402
|
项目删除功能
项目删除权限
课程列表用户颜色
|
10 years ago |
|
huang
|
9c472b9358
|
课程成员列表乱的问题
|
10 years ago |
|
huang
|
01b21ceda1
|
项目留言重复提交问题
|
10 years ago |
|
huang
|
1ba0dae3c4
|
修复课程留言重复提交问题
|
10 years ago |
|
huang
|
9710731a2c
|
课程配置添加登录名
|
10 years ago |
|
huang
|
c7b2c9e3af
|
课程删除功能
admin中课程列表取消删除按钮
|
10 years ago |
|
huang
|
4f7f4acb1f
|
课程删除
|
10 years ago |
|
huang
|
068c305c06
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
Conflicts:
app/views/courses/member.html.erb
app/views/courses/settings.html.erb
app/views/repositories/show.html.erb
db/schema.rb
处理冲突
|
10 years ago |
|
guange
|
0c7db76371
|
tag没闭合的错误
|
10 years ago |
|
guange
|
3d2ac4b59f
|
KE引用统一使用import_ke
|
10 years ago |
|
huang
|
9716e99533
|
课程成员提交“修改角色”
|
10 years ago |
|
huang
|
7daaa59010
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
10 years ago |
|
huang
|
b6edabed9c
|
修改角色
|
10 years ago |
 Tim
|
dfa9b4cf74
|
学生列表调整
|
10 years ago |
|
huang
|
5d18b14e73
|
Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
|
10 years ago |
|
huang
|
057d9a3337
|
0
|
10 years ago |
|
huang
|
b91c65798d
|
课程成员添加设置
|
10 years ago |
|
huang
|
e3e0f4ab37
|
鼠标移动+号显示留言
|
10 years ago |
|
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
10 years ago |
|
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
10 years ago |
 ouyangxuhua
|
b05708f6e8
|
解决一下三个bug:
1.新建组织文章时，置标题和描述为空，点击取消按钮，却弹出“标题不能为空”的提示信息
2.课程/项目关联组织：点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织，点击确定编辑的按钮后又返回组织列表页面，应返回组织详情页面
|
10 years ago |
|
huang
|
8c83bbfff3
|
课程英雄榜数据
|
10 years ago |
|
huang
|
061a1f602a
|
效果实现
|
10 years ago |
|
huang
|
85515befc4
|
实现工具栏数字大于0显示，小于0隐藏
|
10 years ago |
 lizanle
|
34a2c2c90d
|
课程创建属性添加 是否允许学生上传资源
|
10 years ago |
|
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
ouyangxuhua
|
af981f841e
|
添加组织时，翻页提醒功能改善
|
10 years ago |
|
ouyangxuhua
|
b231b44e81
|
1.项目和课程中，添加翻页提醒；
2.项目和课程中，删除组织关联时，给出弹窗，确认是否删除。
|
10 years ago |
|
ouyangxuhua
|
fc7e41ebf9
|
1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置
|
10 years ago |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
10 years ago |
|
lizanle
|
291868ba43
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
|
10 years ago |
|
lizanle
|
0eff2bcb74
|
课程添加允许学生发布资源的配置
|
10 years ago |
|
cxt
|
4adc6deabf
|
配置课程页面的开课学期不可更改，弹框提醒用户。
|
10 years ago |
|
lizanle
|
0fdf898845
|
设置完成后跳转到大纲页面
|
10 years ago |
|
lizanle
|
57730047d3
|
设置完成后跳转到大纲页面
|
10 years ago |
|
lizanle
|
6741bb6960
|
取消大纲的提示
|
10 years ago |
|
lizanle
|
99400ea160
|
学生 老师身份不同时默认身份也应该不同
学生的加入的时候去掉老师
|
10 years ago |
|
lizanle
|
0d68262d3c
|
学生 老师身份不同时默认身份也应该不同
学生的加入的时候去掉老师
|
10 years ago |
|
lizanle
|
9881ad103d
|
学生 老师身份不同时默认身份也应该不同
|
10 years ago |
|
cxt
|
958532bedc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
cxt
|
ee7b21de72
|
禁用匿评功能
|
10 years ago |
|
lizanle
|
8ffbe8f300
|
course manager can not apply to join that course
|
10 years ago |
|
lizanle
|
7df2a632fc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
681f33ee2c
|
取消大纲 提示
|
10 years ago |
|
cxt
|
0fb48a41cb
|
课程搜索页面的加入按钮
|
10 years ago |
|
lizanle
|
4b9a60658f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
7962bdf5a2
|
outline
after keyboard enter
_course_outline_list cannot disppear
|
10 years ago |
|
huang
|
48d0553e8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
b7a6bc3614
|
outline url
|
10 years ago |
|
huang
|
e41a53cb8f
|
Merge branch 'szzh' into develop
|
10 years ago |
|
lizanle
|
ae6fe6f9a7
|
申请加入课程，允许身份覆盖
|
10 years ago |
|
lizanle
|
af14861b96
|
取消大纲
|
10 years ago |
|
lizanle
|
27a2a2890f
|
大纲设置图标 鼠标放上去呈手型
图标一直显示
|
10 years ago |
|
lizanle
|
4d7ca63a12
|
添加一个参数控制
在课程首页设置大纲不跳转
在大纲展示页面设置大纲，跳转大纲页面
|
10 years ago |
|
lizanle
|
8dc730cd3e
|
大纲回复框改变
|
10 years ago |
|
lizanle
|
a27c359df4
|
大纲设置的图标改动
|
10 years ago |
|
lizanle
|
bc7ce290a2
|
没有选中任何大纲不能提交
|
10 years ago |
|
huang
|
286b1a1f0d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
10 years ago |
|
ouyangxuhua
|
c8a28ef060
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
ouyangxuhua
|
070166e7c7
|
搜索课程后，点击退出按钮，执行操作后，刷新当前页面，使退出变成加入。
|
10 years ago |
|
lizanle
|
0815cde772
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
578bb2537d
|
课程大纲功能
|
10 years ago |
|
ouyangxuhua
|
1963434242
|
解决搜索课程后，点击加入按钮无反应的bug
|
10 years ago |
|
lizanle
|
ac82910aa5
|
大纲
|
10 years ago |
|
lizanle
|
b67afc2b95
|
大纲
|
10 years ago |
|
lizanle
|
eaba915598
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
33501f0f69
|
隐藏课程搜索页面的“加入”按钮
|
10 years ago |
|
lizanle
|
c2be8b4eec
|
课程大纲界面
|
10 years ago |
|
cxt
|
bd350536eb
|
弹出“加入课程”对话框后隐藏"加入/新建课程"的菜单
|
10 years ago |
|
lizanle
|
a0683d4900
|
加入课程界面输入框没有对齐
博客关注粉丝文字也要加超链接
|
10 years ago |
|
cxt
|
5f5a235e4b
|
点击加入课程后首页样式发生变化
|
10 years ago |
|
lizanle
|
4431f4664f
|
点击确定自动关闭
|
10 years ago |
|
lizanle
|
479b23a1fd
|
重复加入问题给出提示
并不发送消息
不允许重复发送相同的申请
点击确定自动关闭
|
10 years ago |
|
lizanle
|
69d5f8b97b
|
课程不存在的时候的提示
|
10 years ago |
|
cxt
|
1ddb21d0a9
|
动态中的描述展开时去掉line-height，收起时添加line-height
|
10 years ago |
|
cxt
|
e2990fb55c
|
控制动态描述的高度为20行，可展开和收起。
|
10 years ago |
|
lizanle
|
a817c3b81e
|
添加身份
|
10 years ago |
|
lizanle
|
4f1f34ac58
|
暂时屏蔽掉加入课程的分类情况
|
10 years ago |
|
cxt
|
770f2f14bd
|
个人动态、课程动态、讨论区、单个帖子页面的图片可点击
|
10 years ago |
|
cxt
|
caa278d9f5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/boards_controller.rb
db/schema.rb
|
10 years ago |
|
cxt
|
20ff1430fc
|
动态回复默认显示3个，“收起回复”、“展开更多”后去掉回复数
|
10 years ago |
|
Tim
|
edbcb534c5
|
加入课程弹窗修改
|
10 years ago |
|
lizanle
|
44b148b32f
|
act有可能为空，导致500错误
|
10 years ago |
|
Tim
|
4c5b59ebc8
|
作业动态图标替换
|
10 years ago |
|
cxt
|
e2a5819d74
|
课程动态首页的图片可点击
|
10 years ago |
 sw
|
35b1bc8069
|
课程内作业列表界面修改
|
10 years ago |
|
cxt
|
223bac373f
|
课程动态的数据迁移
|
10 years ago |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
10 years ago |
|
cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
10 years ago |
|
cxt
|
a714b10860
|
阻止配置课程、加入课程、新建课程、新建项目版本、新建版本库等页面输入框的自动填充
|
10 years ago |
|
lizanle
|
95f66a304c
|
通过 kindeditor_tag f.kindeditor生产的编辑框可以自动长高缩短
课程模块的通知，讨论区，留言都可以自动的长高，缩短
|
10 years ago |
|
sw
|
7424c82eae
|
留言框高度
|
10 years ago |
|
sw
|
e55b61cb81
|
课程留言回复
|
10 years ago |
|
cxt
|
ac419cef87
|
去掉课程/项目搜索列表的搜索框
|
10 years ago |
|
sw
|
bfd13bf98a
|
课程回复按钮样式
|
10 years ago |
|
sw
|
faea706683
|
Revert "Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh"
This reverts commit 3776689661, reversing
changes made to d48cc8073a.
|
10 years ago |
|
sw
|
f81bab6319
|
课程回复
|
10 years ago |
suntao
|
efe5c1e3f4
|
课程宽度调整
|
10 years ago |
|
sw
|
2d00eb982c
|
取消跳转到个人主页
|
10 years ago |
|
sw
|
6051d0797d
|
课程搜索结果不正确
|
10 years ago |
|
sw
|
5cf6b7e76a
|
课程发布时间--->创建时间
|
10 years ago |
|
sw
|
23f8bd8312
|
搜索课程结果列表课程动态
|
10 years ago |
|
sw
|
a240a2785f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
2f77adfe9c
|
课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示
|
10 years ago |
|
lizanle
|
fbcd19b54f
|
1.编辑分班的时候编辑框里要有默认是原来的该班级名字
2.课程通知搜索输入空格仍然返回所有的通知
|
10 years ago |
|
lizanle
|
a282d81551
|
加入课程或者已经加入的课程，提示后进行跳转
|
10 years ago |
|
sw
|
c200634c27
|
个人主页--课程列表：加入课程失败后，加入课程按钮却能变为提交作业按钮
|
10 years ago |
|
cxt
|
55a7c168b5
|
Merge branch 'szzh' into dev_cxt2
Conflicts:
app/views/users/show.html.erb
|
10 years ago |
|
sw
|
01bdf5fdca
|
访问他人课程列表，非课程成员的课程显示加入课程，加入课程后界面刷新
|
10 years ago |
|
cxt
|
6cb3d19584
|
课程列表的课程动态数与实际不符
|
10 years ago |
|
sw
|
6c894e63ee
|
添加、修改分班的长度限定为20
|
10 years ago |
|
sw
|
f4786ea71f
|
学生列表加入时间对齐
|
10 years ago |
|
sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
10 years ago |
|
sw
|
fa2dfd0692
|
作品得分弹出框，作业名过长显示问题
|
10 years ago |
|
sw
|
cf4c6c83d3
|
作业积分改为总分
|
10 years ago |
|
huang
|
40f393a646
|
课程讨论区ajax刷新
|
10 years ago |
|
huang
|
b089b973ab
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
 yutao
|
17a317a87c
|
个人主页弹出框bug
|
10 years ago |
|
huang
|
4db788c948
|
修改课程讨论区、留言中姓名权限
|
10 years ago |
 zhangshenjerry
|
bf9e905b57
|
如图，课程学生列表中，编辑分班的输入框和添加分班的输入框同时显示时不合适
|
10 years ago |
|
yutao
|
5c011fd342
|
个人主页
|
10 years ago |
|
huang
|
06c2718b54
|
课程、项目留言页面默认字体配置
|
10 years ago |
|
yutao
|
d882a3c5ee
|
bug#2948:在课程和个人主页模块，被留言的人应该能看到留言人的昵称和真实姓名
|
10 years ago |
|
sw
|
d196b3930d
|
课程留言显示真实姓名
|
10 years ago |
|
sw
|
bb9c46a632
|
课程留言回复，回复内容和时间在同一行
|
10 years ago |
|
sw
|
66eba14dfe
|
课程首页加入课程样式
课程首页 公开资源-->资源
|
10 years ago |
|
sw
|
1c10775619
|
Merge branch 'guange_dev' into szzh
|
10 years ago |
|
sw
|
8a3a0af20f
|
学生列表作业积分弹框内容
|
10 years ago |
|
guange
|
f58b530484
|
给课程活动慢加上缓存，并且加入了开关
|
10 years ago |
|
guange
|
71ae441bfc
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
d793a8119a
|
修改粘图的加载方式
|
10 years ago |
|
yutao
|
3b3b8661c8
|
bug#2827:IE浏览器：讨论区：点击回复时，编辑器下面会出现内容不能为空
|
10 years ago |
|
yutao
|
790e1741ab
|
bug#2859:课程留言--二级回复块被挤下来了
|
10 years ago |
|
sw
|
cc2bd5f7b1
|
作品列表收索时，收索条件内容在课程收索栏
|
10 years ago |
|
sw
|
d302c7ca86
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
e8d9d53bcc
|
bug#2832:讨论区：回复带有图片的内容，在动态查看时，创建时间显示错位。
|
10 years ago |
|
sw
|
4af3a28eab
|
课程首页：加入课程，加入失败继续显示加入课程弹框
|
10 years ago |
|
sw
|
90bd3bad58
|
Merge branch 'develop' into szzh
|
10 years ago |
|
sw
|
c07f66776c
|
课程留言列表，拉长时显示不正确
|
10 years ago |
|
yutao
|
e138292f2a
|
...
|
10 years ago |
|
yutao
|
46da84cd81
|
...
|
10 years ago |
|
sw
|
9938c9f83a
|
课程首页通知不显示附件
|
10 years ago |
|
yutao
|
3c515dd077
|
...
|
10 years ago |
|
yutao
|
de3bb64fd9
|
课程讨论区换编辑器
|
10 years ago |
|
sw
|
f956b27953
|
作业积分显示平均分
|
10 years ago |
|
sw
|
5d5159f4c7
|
助教也可在个人首页关闭课程
|
10 years ago |
|
yutao
|
b4732814e6
|
...
|
10 years ago |
|
yutao
|
a456616212
|
...
|
10 years ago |
|
yutao
|
8fcf7ac7a8
|
...
|
10 years ago |
|
yutao
|
85682d6bbc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
cd8f3bdea3
|
...
|
10 years ago |
|
sw
|
89d15e7673
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
10 years ago |
|
sw
|
b7dbaca15b
|
在学生列表，点击学生积分之后，a标签有下划线
|
10 years ago |
|
sw
|
ae950cf3c0
|
学生评分弹出框缺少关闭按钮
|
10 years ago |
|
sw
|
faeee5bc0d
|
课程搜索报错
|
10 years ago |
|
sw
|
e6af34e9f8
|
学生列表显示
|
10 years ago |
|
sw
|
b935f50b36
|
课程内作业列表、新建作业等路由关闭，相关页面、方法删除
|
10 years ago |
|
sw
|
b5dc424714
|
bid超过20行才显示更多按钮
|
10 years ago |
|
guange
|
1fe49c8cb1
|
添加删除作业功能
|
10 years ago |
|
yutao
|
a7e2e4766a
|
修复bug#2480:course主页查询课程输入关键字“数据库”，如图课程“课程简介”字样被截断了
|
11 years ago |
|
sw
|
ea1a98f8ac
|
测试版--搜狗浏览器中课程名称显示为当前登录用户的用户名
|
11 years ago |
 alan
|
e3d277163f
|
修改个人主页的链接
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
72ef4e1db4
|
修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
guange
|
f53691ceed
|
修复不是News的附件显示出错
|
11 years ago |
|
guange
|
af107d861b
|
将下载信息放到课程动态
|
11 years ago |
|
guange
|
eb6c3a9377
|
课程搜索很慢，原因是以前成员数计算太复杂
|
11 years ago |
|
sw
|
db6218a487
|
教师列表界面增加角色显示、教师显示真实姓名
|
11 years ago |
|
sw
|
2749c4f890
|
课程配置页面，角色改为中文
|
11 years ago |
|
sw
|
cba473269d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
fd28310e15
|
修改issue列表太长换行问题
|
11 years ago |
|
sw
|
cba760b8b0
|
课程、项目搜索提示
|
11 years ago |
|
sw
|
6bbf8c8f45
|
课程通知、课程留言取消按钮删除编辑器内内容
|
11 years ago |
|
sw
|
5b5423b8c5
|
修改贴吧新建帖子、回复显示样式的问题
|
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 |
|
sw
|
5385f35aff
|
教师列表删除翻页
|
11 years ago |
|
lizanle
|
d6527f1f7e
|
去掉学生列表分页
|
11 years ago |
whimlex
|
0d26f64afd
|
搜索课程——授课时间”与“课程简介”显示异常
|
11 years ago |
|
sw
|
6df1f55ac4
|
添加课程成员后不自动刷新
|
11 years ago |
|
sw
|
d5e71e9803
|
增加课程成员收索功能后、添加课程成员，成员列表不自动刷新
|
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 |
|
sw
|
cdbe95f6ec
|
修改老师配置界面成员搜索
|
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 |
|
whimlex
|
ca1e902a8f
|
#2279 搜索课程进入结果页面，如图，建议将“授课时间”与“课程简介”与上面的“课程名称”等信息对齐
|
11 years ago |
|
sw
|
2db3ab9d13
|
修改课程时增加密码与课时的验证
|
11 years ago |
|
sw
|
94ca6cd2f9
|
新建课程时增加密码与课时的验证
|
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 |
|
sw
|
1dc8190aa0
|
1、修改无跳转的href链接为javascript:void(0)
2、增加课程资源库的界面
|
11 years ago |
|
huang
|
0c90f2361d
|
项目用户反馈页面调整
|
11 years ago |
|
sw
|
434415343c
|
课程留言图片显示问题
|
11 years ago |
|
sw
|
400d1a147d
|
课程新编辑器导致图片超出页面
|
11 years ago |
|
sw
|
9ebed65fde
|
课程动态：作业动态url不对
|
11 years ago |
|
sw
|
5ad1028c49
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
