 alan
|
372bf71ca5
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
cc5738c12f
|
课程讨论区回复样式错误
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
 sw
|
a77a572a4d
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
guange
|
06b17581b1
|
图片撑出在firefox上的问题
|
10 years ago |
|
sw
|
9bbae3d7ac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/application.css
|
10 years ago |
|
sw
|
3dc1b2642a
|
发布竞赛日期选择图标有问题
|
10 years ago |
|
sw
|
c241fc00e9
|
测试版--课程--课程作业：如图作业附件显示与图标重叠
|
10 years ago |
|
sw
|
c129e767e5
|
测试版：公共贴吧：显示页数应该与虚线分开
|
10 years ago |
 huang
|
574e79ff57
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
725a6e4238
|
解决发布竞赛日历问题
|
10 years ago |
|
alan
|
0708279c5e
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
8a52225f4d
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
f9d9ffe4d9
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
72ef4e1db4
|
修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
963a21283f
|
1、修改作业打分插件星星移位
2、修改返还批改结果显示不正确
|
10 years ago |
|
guange
|
52217efcb6
|
issue中图片超出边框
|
10 years ago |
|
guange
|
d88b5dbbed
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
69afe8809e
|
经测试，转到rspec各方面成熟一点。
|
10 years ago |
|
huang
|
d60639f557
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
aef91be36c
|
修复新建缺陷样式冲突
|
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
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
10 years ago |
|
guange
|
9f4d7fc033
|
merge
|
10 years ago |
|
guange
|
80d44e4f4c
|
新版项目的上传图标问题解决
|
10 years ago |
|
alan
|
fe92b05026
|
讨论区编辑添加附件
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
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
|
6a31a99c93
|
编辑课程讨论区回复时的问题
|
10 years ago |
|
sw
|
25e80cefb8
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
sw
|
d4f73ae472
|
111
|
10 years ago |
|
sw
|
5f6f7b7cdf
|
引用功能图片显示不正常
|
10 years ago |
|
sw
|
ee051f6a37
|
1、课程讨论区回复取消功能
2、课程讨论区回复时不现实主题
|
10 years ago |
|
guange
|
5c4ad1ce7d
|
merge
|
10 years ago |
|
guange
|
eed39ef0ef
|
上传头像会进行压缩
|
10 years ago |
|
alanlong9278
|
f9a25373b0
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alanlong9278
|
f638dd6810
|
课程讨论区
Signed-off-by: alanlong9278 <547533434@qq.com>
|
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
|
3d74734607
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
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 |
|
alan
|
3b58810528
|
修改课程讨论区的js
Signed-off-by: alan <547533434@qq.com>
|
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
|
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 |
|
guange
|
3f88a67eef
|
编辑器支持直接粘贴QQ截屏
|
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 |
|
sw
|
b456bc0e62
|
评分支持打0分
|
10 years ago |
|
huang
|
fd28310e15
|
修改issue列表太长换行问题
|
10 years ago |
|
sw
|
6bbf8c8f45
|
课程通知、课程留言取消按钮删除编辑器内内容
|
10 years ago |
|
guange
|
bd54edd770
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
05428213a2
|
让session保持，防止长时间编辑时session丢失
|
10 years ago |
|
sw
|
2e26e27298
|
版本库收起后之保存在cookie中，刷新页面后仍保持收起状态
|
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
|
78c410b1ec
|
解决缺陷中多余的对勾图标
|
10 years ago |
|
sw
|
0a8f3faf6a
|
1、project.css错误代码
2、项目上传资源弹框
|
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
|
135c3d9b19
|
课程讨论区代码重构
解决路由匹配和JS显示冲突
|
10 years ago |
|
sw
|
a6a144d079
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
4c3013f1ac
|
修改作业评价上传附件功能500
作业标题换行
|
10 years ago |
 lizanle
|
edd4bbbe96
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
404b3e3275
|
暂时去掉一些editor功能
|
10 years ago |
|
sw
|
2d7e4278ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传，可上传批改后的作业
2、修改作业列表作业数不显示
|
10 years ago |
|
lizanle
|
df7b33fe48
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
fb043f2451
|
暂时去掉有问题的功能
|
10 years ago |
|
lizanle
|
de640a59b6
|
没有push上传成功，打个空格继续push
|
10 years ago |
|
lizanle
|
2aac345645
|
去掉重复的图片上传
|
10 years ago |
|
lizanle
|
3fac34d942
|
删掉没有被修改的图片
|
10 years ago |
|
sw
|
456dcf9d40
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
a64b3940dd
|
1、当教师评论为空时，预留一部分
|
10 years ago |
|
lizanle
|
d07a1b945f
|
kindeditor增加切换到简单功能按钮
|
10 years ago |
|
lizanle
|
92b79b40da
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
e5e0a5857a
|
kindeditor增加切换到简单功能按钮
|
10 years ago |
|
whimlex
|
4982c9f7d2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
f3fb0115e4
|
版本库git操作文档默认展开，样式调整
|
10 years ago |
|
lizanle
|
99ae746bff
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
8b6369a84f
|
kindeditor增加更多功能按钮
|
10 years ago |
|
whimlex
|
40fdda0ee2
|
版本库git帮助文档的显示与隐藏
|
10 years ago |
|
sw
|
03044d0190
|
课程--资源库：加粗上传课件分类字样
|
10 years ago |
|
lizanle
|
aff7a97c4b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
338a7d3ded
|
暂时去掉code icon
|
10 years ago |
|
whimlex
|
481f7ee4ba
|
意见反馈按回退键重新计算
|
10 years ago |
|
whimlex
|
091c6125d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
85e1262769
|
意见反馈
|
10 years ago |
|
sw
|
91e37c7ab8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
650ffd4397
|
课程和项目意见反馈
|
10 years ago |
|
lizanle
|
138fff1bf5
|
暂时去掉全屏icon
|
10 years ago |
|
lizanle
|
c384384b35
|
改变图标icon位置
|
10 years ago |
|
lizanle
|
3810561fb1
|
改变图标icon
|
10 years ago |
|
sw
|
f67bdae22a
|
课程讨论去引用、回帖不换行
|
10 years ago |
|
lizanle
|
3e27acf03c
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
f4b6b795e3
|
kindeditor增加代码编辑功能
|
10 years ago |
|
whimlex
|
1f83950b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
b61d76d94e
|
意见反馈
|
10 years ago |
|
lizanle
|
cf9cc0af82
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
lizanle
|
681f7b75d6
|
kindeditor图片上传改为一次弹框
|
10 years ago |
|
whimlex
|
e61822d74a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
b3e0490b90
|
意见反馈
|
10 years ago |
|
sw
|
e21dfe28fd
|
Merge branch 'szzh' into guange_dev
|
10 years ago |
|
lizanle
|
f7dd4924c1
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
public/assets/kindeditor/kindeditor.js
|
10 years ago |
|
lizanle
|
3b99c97617
|
kindeditor图片上传改为一次弹框
|
10 years ago |
|
guange
|
5c0d0230fc
|
去掉首页底部留白和不对齐
|
10 years ago |
|
whimlex
|
b5781ac22b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
5d0d9de6e8
|
意见反馈各主页内保持一致
|
10 years ago |
|
huang
|
4da77d8a71
|
wiki页面显示
|
10 years ago |
|
huang
|
c9bfe00a4f
|
修改成员列表的排列
版本库页面色系
|
10 years ago |
|
sw
|
cfe0635804
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
de23c3c2a8
|
配置中子页面调整
隔行换色显示
显示页面左对齐
|
10 years ago |
|
sw
|
5b5423b8c5
|
修改贴吧新建帖子、回复显示样式的问题
|
10 years ago |
|
huang
|
ee1c53bacc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
2070d69d44
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
348eae5c45
|
修改项目模式提示样式
版本库
版本
|
10 years ago |
|
whimlex
|
19fe973b5b
|
上传头像
|
10 years ago |
|
whimlex
|
d66af82478
|
新建竞赛页面日历插件显示错误
|
10 years ago |
|
sw
|
9a07989917
|
调整header的login的样式
|
10 years ago |
|
sw
|
427f26b058
|
header的login显示
|
10 years ago |
|
whimlex
|
36f2643ad8
|
上传logo
|
10 years ago |
|
whimlex
|
86bd708c5d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
whimlex
|
21f08830df
|
意见反馈功能修改
|
10 years ago |
|
sw
|
2f2d4257c2
|
调整提交作业按钮样式
|
10 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
|
10 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
|
10 years ago |
|
sw
|
3d8ec17bb1
|
修改学生作业得分列表弹出框样式
|
10 years ago |
|
whimlex
|
0f037e78fa
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
public/stylesheets/public.css
|
10 years ago |
|
whimlex
|
5123ca1047
|
版本库样式调整
|
10 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
|
10 years ago |
|
huang
|
8b77079f44
|
公开。私有标识强制不换行
|
10 years ago |
|
sw
|
57193b077e
|
作品列表取消分页显示
|
10 years ago |
|
whimlex
|
b99f8d8056
|
上传头像，上传课程项目logo提示
|
10 years ago |
|
huang
|
5bfef259de
|
去掉缺陷列表空白处的链接
|
10 years ago |
|
huang
|
dd25cdc065
|
1、修改项目三种类型术语
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
|
10 years ago |
|
huang
|
692500af2e
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
93e3247685
|
项目名称不能为空提示
|
10 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>
|
10 years ago |
|
whimlex
|
86ef3e680a
|
项目简介展开更多信息不超过一定内容不显示
|
10 years ago |
|
whimlex
|
05712c4c06
|
学生作业改为作品
|
10 years ago |
|
whimlex
|
11d83a863a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/projects/show.html.erb
|
10 years ago |
|
whimlex
|
ab39d54b45
|
版本库文件列表样式
|
10 years ago |
|
huang
|
7340ef793c
|
修改新建项目的显示样式
|
10 years ago |
|
whimlex
|
65e6b41d91
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
