 sw
|
b182feb988
|
作业全部附件打包下周无法下载
|
10 years ago |
|
sw
|
a1e28bcd9e
|
增加按学生login、学号、真实姓名排序
|
10 years ago |
 alan
|
32a6c29c7c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
Gemfile
app/views/layouts/base_projects.html.erb
app/views/projects/_development_group.html.erb
app/views/projects/_research_team.html.erb
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
4783bad924
|
1、打分后作品的各项得分数据刷新
2、作品列表样式调整
|
10 years ago |
|
alan
|
59c77e870c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
db/schema.rb
public/javascripts/course.js
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
fea784cbcc
|
1、添加评分回复路由改变
2、删除回复功能及界面刷新
|
10 years ago |
|
sw
|
2bb59ffd79
|
1、作品评论回复以及相关界面刷新
2、调整回复框宽度
|
10 years ago |
 huang
|
95f3d89afa
|
项目新闻添加编辑器：显示页面、列表页面新样式显示
|
10 years ago |
|
sw
|
1fe7c70955
|
1、评价作品增加批阅结果的删除与显示
2、修改课程的昵称下拉框无法正常显示
|
10 years ago |
|
sw
|
1ae8c7d234
|
作业评分、上传评阅结果，以及上传结果的显示样式
|
10 years ago |
|
huang
|
a6da2b4a01
|
项目添加新的编辑器
显示页面显示样式调整
|
10 years ago |
|
sw
|
f3597d9aa5
|
开启/关闭匿评弹框提示
|
10 years ago |
|
huang
|
052d293f82
|
新建项目时候：
如果我的项目中有重名的项目不允许新建
|
11 years ago |
|
sw
|
95a48b7da0
|
1、作品show界面详细内容填充
2、更新public.css
3、增加作品附件显示
|
11 years ago |
|
alan
|
1c9b9dff79
|
修改《编辑器还原》《提示信息的添加》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
c18d1d9585
|
修改《匿名发布新帖》《编辑时出现跳转错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
8c72df74d6
|
1、增加返回顶部功能
2、点击作品名称，弹出详细信息
3、作品列表信息生成
|
11 years ago |
|
alan
|
a0ca31780e
|
修改《帖子排序》《资源区链接错误》《增加回帖回复》《添加编辑器》
《展开，收起，展开回复，收起回复 的样式问题》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
guange
|
689ec5cdfc
|
课程通知列表更多功能bug
|
11 years ago |
|
sw
|
faeb06aae8
|
1、更新css文件
2、新建作品功能天津
3、老师新建作业时增加文件的保存
|
11 years ago |
|
sw
|
56723d106f
|
新建作品功能，以及相关js验证
|
11 years ago |
|
guange
|
7b5021c4fd
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
alan
|
f1f871ffda
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
4a588506a4
|
增加编辑器
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
40f6295609
|
1、新建作业功能完成
2、修改新建作业时传递参数不完整
3、进入编辑作业界面，部分界面显示的初始化
4、提交新建作业按钮
|
11 years ago |
|
huang
|
3f744d46f2
|
超级管理员界面--贴吧回复成功
|
11 years ago |
|
sw
|
296d4a678c
|
新建作业js验证以及页面操作js效果添加
|
11 years ago |
|
sw
|
a7fd5b950d
|
1、老师新建作业界面，数据i初始化
2、部分help方法添加
|
11 years ago |
|
huang
|
fa563b60d5
|
项目issue添加周报功能
|
11 years ago |
|
sw
|
3b3ca0024d
|
css错误修改
|
11 years ago |
|
sw
|
09b3ba8a6a
|
更新css文件，新建作业静态页面
|
11 years ago |
|
alan
|
ab9d74f364
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
052868a6b4
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
huang
|
6c6ae38f7a
|
课程主页私有样式
|
11 years ago |
|
guange
|
e3633e702c
|
firefox样式问题
|
11 years ago |
 yutao
|
df24007dbb
|
修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开
|
11 years ago |
|
guange
|
1226f74750
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
11 years ago |
|
guange
|
49d836d331
|
上传头像大小和图片类型在后台加入限制,且通过测试
|
11 years ago |
|
sw
|
a44cba2e6a
|
Merge branch 'develop' into guange_dev
|
11 years ago |
|
guange
|
d2a7d41963
|
头像加入大小限制
|
11 years ago |
|
sw
|
659ff254e1
|
background背景图片拉伸
|
11 years ago |
|
guange
|
66e2bc5ef2
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
588d96a0c0
|
头像上传只允许图片
|
11 years ago |
|
sw
|
a8e7590b16
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
99e3d09e83
|
IE浏览器中li前面有个点
|
11 years ago |
|
guange
|
907d89e1cc
|
merge
|
11 years ago |
|
yutao
|
233c68e965
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yutao
|
68cf5fa55e
|
修复:当1个页面存在多个上传控件时的各种bug
|
11 years ago |
|
huang
|
7db9e2eb7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
2fb5871058
|
缺陷显示新界面
|
11 years ago |
|
guange
|
e5a9d87ce1
|
新建贴吧如果放个图片就会撑坏版面
|
11 years ago |
|
alan
|
372bf71ca5
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
cc5738c12f
|
课程讨论区回复样式错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
a77a572a4d
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
guange
|
06b17581b1
|
图片撑出在firefox上的问题
|
11 years ago |
|
sw
|
9bbae3d7ac
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/application.css
|
11 years ago |
|
sw
|
3dc1b2642a
|
发布竞赛日期选择图标有问题
|
11 years ago |
|
sw
|
c241fc00e9
|
测试版--课程--课程作业：如图作业附件显示与图标重叠
|
11 years ago |
|
sw
|
c129e767e5
|
测试版：公共贴吧：显示页数应该与虚线分开
|
11 years ago |
|
huang
|
574e79ff57
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
725a6e4238
|
解决发布竞赛日历问题
|
11 years ago |
|
alan
|
0708279c5e
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
8a52225f4d
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
f9d9ffe4d9
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
72ef4e1db4
|
修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
963a21283f
|
1、修改作业打分插件星星移位
2、修改返还批改结果显示不正确
|
11 years ago |
|
guange
|
52217efcb6
|
issue中图片超出边框
|
11 years ago |
|
guange
|
d88b5dbbed
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
guange
|
69afe8809e
|
经测试，转到rspec各方面成熟一点。
|
11 years ago |
|
huang
|
d60639f557
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
aef91be36c
|
修复新建缺陷样式冲突
|
11 years ago |
|
alan
|
0af8c1cc38
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
bd77ad9ac1
|
展开。收起
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
guange
|
bb506b2ab4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
# Conflicts:
# db/schema.rb
|
11 years ago |
|
guange
|
9f4d7fc033
|
merge
|
11 years ago |
|
guange
|
80d44e4f4c
|
新版项目的上传图标问题解决
|
11 years ago |
|
alan
|
fe92b05026
|
讨论区编辑添加附件
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
guange
|
092af28476
|
修正编辑器在火狐下粘贴不成功
|
11 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>
|
11 years ago |
|
alan
|
25bcc676b9
|
增加附件功能以及修改路由跳转
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
6a31a99c93
|
编辑课程讨论区回复时的问题
|
11 years ago |
|
sw
|
25e80cefb8
|
Merge branch 'szzh' into guange_dev
|
11 years ago |
|
sw
|
d4f73ae472
|
111
|
11 years ago |
|
sw
|
5f6f7b7cdf
|
引用功能图片显示不正常
|
11 years ago |
|
sw
|
ee051f6a37
|
1、课程讨论区回复取消功能
2、课程讨论区回复时不现实主题
|
11 years ago |
|
guange
|
5c4ad1ce7d
|
merge
|
11 years ago |
|
guange
|
eed39ef0ef
|
上传头像会进行压缩
|
11 years ago |
|
alanlong9278
|
f9a25373b0
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alanlong9278
|
f638dd6810
|
课程讨论区
Signed-off-by: alanlong9278 <547533434@qq.com>
|
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
|
3d74734607
|
Signed-off-by: alanlong9278 <547533434@qq.com>
|
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 |
|
alan
|
3b58810528
|
修改课程讨论区的js
Signed-off-by: alan <547533434@qq.com>
|
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
|
628ffc67dd
|
课程作品列表界面增加返回顶部功能
|
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 |
