 huang
|
84efdb16c9
|
解决wiki500错误
show_new代码优化（代码中存在错误）
|
10 years ago |
 alan
|
0af8c1cc38
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
bd77ad9ac1
|
展开。收起
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
guange
|
c0e1eb85a1
|
Merge branch 'guange_dev' into szzh
|
10 years ago |
|
guange
|
f53691ceed
|
修复不是News的附件显示出错
|
10 years ago |
|
guange
|
f90278fe73
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
guange
|
af107d861b
|
将下载信息放到课程动态
|
10 years ago |
|
huang
|
404073d76e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
c148a8a145
|
私有项目版本库全休修改
|
10 years ago |
|
guange
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
10 years ago |
|
guange
|
f31fe81c5d
|
将课程通知中的附件提到列表和动态中
|
10 years ago |
|
guange
|
eb6c3a9377
|
课程搜索很慢，原因是以前成员数计算太复杂
|
10 years ago |
|
alan
|
a8d19a119a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
fe2f6a0d9d
|
修改样式以及添加回复取消功能
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
406d608edc
|
版本库私有权限设置
--项目成员可以查看
--左侧入口隐藏
--禁止通过url访问
|
10 years ago |
|
huang
|
68050b7d22
|
版本库页面脚本过长
|
10 years ago |
|
huang
|
90559556c6
|
新建版本库，输入框对齐
|
10 years ago |
|
huang
|
6f3621f6c0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
a62001c892
|
新建版本库--
如果主版本库已存在，新建的时候不允许设置主版本库
|
10 years ago |
|
huang
|
6c500109c9
|
修改项目上传资源
|
10 years ago |
|
guange
|
80d44e4f4c
|
新版项目的上传图标问题解决
|
10 years ago |
|
alan
|
fe92b05026
|
讨论区编辑添加附件
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
29114e19f3
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
guange
|
4e6ca53b53
|
jquery-js找不到报错
|
10 years ago |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
10 years ago |
|
alan
|
8e61136d7f
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
79c0c6f551
|
修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
ee18ba7051
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/boards/_course_show.html.erb
app/views/boards/_project_show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
25bcc676b9
|
增加附件功能以及修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
 sw
|
328dc828c2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
c51794d754
|
提交通知连接
|
10 years ago |
|
huang
|
f3b46c5823
|
项目资源库权限优化：
管理员、资源上传者拥有设置公开私有权限
私有项目不提供引用其它项目和公开功能
|
10 years ago |
|
sw
|
87564eceee
|
修改作业--->修改作品
|
10 years ago |
|
sw
|
6a31a99c93
|
编辑课程讨论区回复时的问题
|
10 years ago |
|
sw
|
25e80cefb8
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
sw
|
821ceb41cf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
5f6f7b7cdf
|
引用功能图片显示不正常
|
10 years ago |
|
huang
|
80e1d1f277
|
去掉讨论区编辑页面虚线
|
10 years ago |
|
sw
|
5a4f477e46
|
课程讨论区编辑、删除按钮互换
|
10 years ago |
|
sw
|
86f686efb3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
ee051f6a37
|
1、课程讨论区回复取消功能
2、课程讨论区回复时不现实主题
|
10 years ago |
|
huang
|
89ea9ddc7b
|
项目讨论区代码还原
样式调整
|
10 years ago |
|
guange
|
5c4ad1ce7d
|
merge
|
10 years ago |
|
guange
|
eed39ef0ef
|
上传头像会进行压缩
|
10 years ago |
|
sw
|
05c26aceb6
|
发布新贴按钮跳转
|
10 years ago |
|
sw
|
34dbde442d
|
还原课程讨论区
|
10 years ago |
|
sw
|
a24e4d345d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
alan
|
c21f2c3927
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
alan
|
2d93cd4bdc
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
23ef975c23
|
讨论区修改bug
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
30c6a71cbc
|
修正新建课程讨论区跳转
|
10 years ago |
|
alan
|
07ca42b24d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
63351fc049
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
e6fe010bd7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
5167cf374c
|
项目讨论区左侧新建按钮跳转页面修改
通过传参跳入（JS实现）
|
10 years ago |
|
alanlong9278
|
087f46bf64
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
huang
|
39fe748da7
|
处理项目讨论区主题、描述内容过长
|
10 years ago |
|
alanlong9278
|
358c9aa019
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alanlong9278
|
65c2c43dcb
|
展开收起回复
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
sw
|
559b5ce7ab
|
打开缺陷在新的页面打开
|
10 years ago |
|
sw
|
78f30344b9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
db6218a487
|
教师列表界面增加角色显示、教师显示真实姓名
|
10 years ago |
|
alanlong9278
|
3995c68b96
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
alanlong9278
|
3d74734607
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
alanlong9278
|
53124710d8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
sw
|
2749c4f890
|
课程配置页面，角色改为中文
|
10 years ago |
|
alanlong9278
|
49fe15a666
|
论坛js冲突
Signed-off-by: alanlong9278 <547533434@qq.com>
|
10 years ago |
|
huang
|
7755d54ef1
|
各处中文角色统一
|
10 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>
|
10 years ago |
|
huang
|
c6b1a4af59
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
3df8a99408
|
添加中文项目成员角色
|
10 years ago |
|
alan
|
20cea86ae8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
3b58810528
|
修改课程讨论区的js
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
ac976e59df
|
匿评可以打0分并给出提示
|
10 years ago |
|
sw
|
b684f5b361
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
e884f58956
|
匿评可以打0分并给出提示
|
10 years ago |
|
alan
|
4bf08e49da
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
08f1c39033
|
修改课程讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
5ea295f8b5
|
1、第一次进入作品列表界面 返回顶部按钮不显示
2、第一次点击返回顶部按钮无用
|
10 years ago |
|
sw
|
5f6f937fcb
|
返回顶部浏览器不兼容
|
10 years ago |
|
sw
|
31f224fd82
|
返回顶部动态显示
|
10 years ago |
|
sw
|
628ffc67dd
|
课程作品列表界面增加返回顶部功能
|
10 years ago |
|
alan
|
4546095ed4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
eee0df8d22
|
修改课程，项目的讨论区界面
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
cba473269d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
 lizanle
|
1cb3dfc833
|
项目issue翻页后查询条件丢失修改
|
10 years ago |
|
lizanle
|
6c7b92558c
|
项目issue翻页后查询条件丢失修改
|
10 years ago |
|
lizanle
|
f214a26329
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
700d2985f6
|
项目issue翻页后查询条件丢失修改
|
10 years ago |
whimlex
|
3b5d8f76a4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
3c72af69ea
|
版本库刷新页面时“git操作指南”展开收起保持一致
|
10 years ago |
|
huang
|
aabdd1a4d7
|
剔除新建问题状态时不必要的代码
|
10 years ago |
|
sw
|
b456bc0e62
|
评分支持打0分
|
10 years ago |
|
huang
|
fd28310e15
|
修改issue列表太长换行问题
|
10 years ago |
|
sw
|
e32a065c09
|
关闭学生评分界面后会跳到最顶部
|
10 years ago |
|
huang
|
a7b2ac860b
|
修改索引迁移文件不能执行的问题
|
10 years ago |
|
sw
|
a5a5ccce41
|
#2452course网站课程资源个数的显示和主页显示的不一致
|
10 years ago |
|
sw
|
cba760b8b0
|
课程、项目搜索提示
|
10 years ago |
|
sw
|
4c268b13dd
|
#2460匿评分配数量限制长度
|
10 years ago |
|
sw
|
6bbf8c8f45
|
课程通知、课程留言取消按钮删除编辑器内内容
|
10 years ago |
|
sw
|
c0b7819870
|
修改资料时昵称提示以及样式
|
10 years ago |
|
huang
|
b39e00b5c7
|
项目讨论区--内容必填
添加国际化
|
10 years ago |
|
sw
|
2e26e27298
|
版本库收起后之保存在cookie中，刷新页面后仍保持收起状态
|
10 years ago |
|
huang
|
0b524b8a40
|
登录后主页只显示我的项目
方法定义
功能实现
|
10 years ago |
|
alan
|
3f859065f2
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
d73ed9e467
|
项目讨论区改版
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
6b7a17de8c
|
版本库Git说明信息
|
10 years ago |
|
alan
|
a5760afa68
|
项目讨论区界面更改
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
whimlex
|
9707a88790
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/project.css
|
10 years ago |
|
whimlex
|
88bbd70102
|
项目名称导航；问题跟踪页面项目导航到问题列表页面；IE问题跟踪页面缩略图显示
|
10 years ago |
|
huang
|
431c6888a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/project.css
|
10 years ago |
|
huang
|
119e540373
|
邮件邀请系统已注册的用户
|
10 years ago |
|
whimlex
|
229d8007fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
538ba33174
|
问题跟踪附件图片显示不拉伸
|
10 years ago |
|
huang
|
b67f401738
|
引入我的课程居中
|
10 years ago |
|
sw
|
0a8f3faf6a
|
1、project.css错误代码
2、项目上传资源弹框
|
10 years ago |
|
huang
|
389266e3e5
|
修改不同角色拥有的权限
管理员--配置、项目类型
开发人员-- 配置、退出项目
报告者-- 退出项目（admin可以配）
|
10 years ago |
|
whimlex
|
33fc193e65
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
bbe4c15293
|
问题跟踪图片附件和定义的样式不一时，调整图片缩略图显示方式
|
10 years ago |
|
huang
|
dfcc076a7f
|
角色多选的时候权限控制
|
10 years ago |
|
huang
|
84a7bb5907
|
修改超级管理员不能退出项目
|
10 years ago |
|
huang
|
f94c2769e6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
135c3d9b19
|
课程讨论区代码重构
解决路由匹配和JS显示冲突
|
10 years ago |
|
sw
|
750393508a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
33da5b4a44
|
1、作业评论回复删除不即使刷新
2、匿评弹框样式
|
10 years ago |
|
huang
|
412052dd0d
|
修改:引入我的文件提示信息
|
10 years ago |
|
sw
|
387ab567d2
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
sw
|
90c143f047
|
评论上传附件换行
|
10 years ago |
|
sw
|
e6a724d439
|
编辑作业样式
|
10 years ago |
|
sw
|
4c3013f1ac
|
修改作业评价上传附件功能500
作业标题换行
|
10 years ago |
|
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传，可上传批改后的作业
2、修改作业列表作业数不显示
|
10 years ago |
|
sw
|
b3fb7914e2
|
课程通知评论编辑框不可用，解决方案：编辑跳转到新的页面
|
10 years ago |
|
guange
|
273b360b51
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
b70ada57e6
|
邮件未处理text发送类型，导致每日发送失败
|
10 years ago |
|
sw
|
261ebb916c
|
1、当login过长，用户匿评界面的星星换行
2、去掉无用的创建作业的代码，与弹出框创建作业代码冲突
|
10 years ago |
|
sw
|
456dcf9d40
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
d2f1f7d142
|
1、当教师评论为空时，预留一部分显示
|
10 years ago |
|
sw
|
a64b3940dd
|
1、当教师评论为空时，预留一部分
|
10 years ago |
|
whimlex
|
e30c446847
|
项目私有问题提示信息
|
10 years ago |
|
sw
|
0970182cd5
|
当教师只评分不评论时，学生可以进行回复
修改作业评论回复框样式不正确，修改项目用户反馈框显示不正确
|
10 years ago |
|
whimlex
|
f3fb0115e4
|
版本库git操作文档默认展开，样式调整
|
10 years ago |
|
whimlex
|
4f48bbbfdb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
40fdda0ee2
|
版本库git帮助文档的显示与隐藏
|
10 years ago |
|
huang
|
e7d85aad27
|
修改项目配置、关注、加入、类型等不同角色显示
|
10 years ago |
|
sw
|
03044d0190
|
课程--资源库：加粗上传课件分类字样
|
10 years ago |
|
huang
|
be9beff0b4
|
解决Roles未定义
|
10 years ago |
|
sw
|
a23231ea7b
|
修改学生创建作品时的样式
|
10 years ago |
|
whimlex
|
5670e2755b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
eba638b42e
|
问题跟踪编辑、更新的权限控制
|
10 years ago |
|
huang
|
020e544b38
|
修改项目--用户反馈--两层回复样式
|
10 years ago |
