 cxt
|
038bcdb80e
|
课程动态的作业编辑菜单样式调整
|
10 years ago |
|
cxt
|
e298f738ed
|
调整课程动态的过滤列表样式
|
10 years ago |
|
cxt
|
c81e07d588
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
223bac373f
|
课程动态的数据迁移
|
10 years ago |
 lizanle
|
7ef48f3fa3
|
标签修改的问题
|
10 years ago |
|
lizanle
|
3fe5adcaf8
|
统一修改tag 会 和边框有边距
|
10 years ago |
 Tim
|
c675a4c227
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
Tim
|
7e3ae446f5
|
资源库头像替换
|
10 years ago |
|
cxt
|
15b45e6706
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/header.css
public/stylesheets/new_user.css
public/stylesheets/public_new.css
|
10 years ago |
|
cxt
|
bb0db1e21d
|
课程动态页面
|
10 years ago |
|
lizanle
|
d512c25c03
|
Merge branch 'szzh' into dev_zanle
Conflicts:
public/javascripts/new_user.js
public/stylesheets/header.css
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
76afbdec3f
|
隐藏kindeditor的“插入代码”，调整项目编号/符号的样式
|
10 years ago |
 sw
|
f2325dee88
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
lizanle
|
b4561fa68d
|
资源库标签 上方的tag重命名的话，所有的含有该tag的资源的那个标签页要重命名
|
10 years ago |
|
cxt
|
a37f39558d
|
项目和课程的列表符号样式修改
|
10 years ago |
|
sw
|
2d48161928
|
新版作品列表界面
|
10 years ago |
|
sw
|
281e97e468
|
课程内老师可以对作业进行编辑、删除、开启匿评
|
10 years ago |
|
sw
|
4b83265508
|
1、编程作业可以修改、删除
2、关闭匿评之后结束匿评按钮样式
3、编程作业成绩计算有问题
4、相关样式修改
5、编程作业作品展开界面功能
|
10 years ago |
|
sw
|
f6f3d83c5e
|
1、老师、学生打分
2、评论及评论的回复功能
|
10 years ago |
|
sw
|
c4abe6b413
|
shou页面的展示以及留言功能
|
10 years ago |
|
sw
|
3573179403
|
匿评作品列表 标题头没有对齐
|
10 years ago |
|
sw
|
9a859d28bf
|
增加匿评时作品的显示
|
10 years ago |
|
sw
|
fa00285529
|
css文件更新
|
10 years ago |
|
sw
|
6af0d8f40c
|
屏蔽课程内发布作业功能，频闭编辑作业功能
|
10 years ago |
suntao
|
4259540f53
|
作业列表宽度调整
|
10 years ago |
|
suntao
|
b2b2537df8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
suntao
|
ea4a005048
|
作业界面排版微调
|
10 years ago |
|
sw
|
e55b61cb81
|
课程留言回复
|
10 years ago |
|
suntao
|
c9d46f17f3
|
回复blockquote调整
|
10 years ago |
|
suntao
|
9bbf658fdb
|
回复框样式调整
|
10 years ago |
|
suntao
|
ed4153faef
|
作业界面宽度还原
|
10 years ago |
guange
|
8ad521d4ab
|
merge
|
10 years ago |
|
guange
|
41f9daed6d
|
编程作业放入到users controller
|
10 years ago |
|
suntao
|
3e9bb8a596
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/new_base_user.html.erb
|
10 years ago |
|
suntao
|
b0ff7f0ee2
|
页面间距调整，头像大小调整
|
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 |
|
suntao
|
efe5c1e3f4
|
课程宽度调整
|
10 years ago |
|
sw
|
2f77adfe9c
|
课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示
|
10 years ago |
|
sw
|
2e4babc2ae
|
修改demo代码，增加C++的示例代码
|
10 years ago |
|
sw
|
9b5a1a5203
|
增加标准代码显示
|
10 years ago |
|
sw
|
3f51368bb2
|
老师布置作业界面增加错误信息的提示
|
10 years ago |
|
sw
|
f163cdac51
|
老师点击测试自动刷新，每组测试对标准代码的返回结果存储
|
10 years ago |
|
sw
|
28509b7cdd
|
老师布置编程作业界面增加测试按钮
|
10 years ago |
|
sw
|
7c818ce59a
|
admin界面增加学校列表显示，以及按名称过滤功能
|
10 years ago |
|
sw
|
c0eea86132
|
增加错误信息的显示
|
10 years ago |
|
sw
|
8c82f6c6a7
|
编程作业新增测试取消测试按钮
|
10 years ago |
|
sw
|
f909fbb835
|
作品列表增加分班过滤
|
10 years ago |
|
sw
|
2eff8cce6a
|
更新css文件
|
10 years ago |
|
sw
|
5e90684677
|
Merge branch 'szzh' into sw_new_course
Conflicts:
app/controllers/homework_common_controller.rb
|
10 years ago |
|
sw
|
283e93c9e2
|
为启用匿评作业不现实匿评栏
|
10 years ago |
 huang
|
162fcc7ff4
|
Merge branch 'szzh' into dev_hjq
|
10 years ago |
|
sw
|
4eb9ce6f0f
|
css报错
|
10 years ago |
|
sw
|
d2b76e92f2
|
展开后成绩得分框显示位置
|
10 years ago |
|
huang
|
e986ee4e4e
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/issues/_edit.html.erb
|
10 years ago |
|
sw
|
642fa8dd5d
|
1、缺评、迟交扣分
2、匿评提示框、最终成绩计算提示框
3、修改作业
|
10 years ago |
|
huang
|
b16e19096f
|
添加新闻回复
|
10 years ago |
|
sw
|
1e12b68027
|
下载附件提示遮住按钮
|
10 years ago |
 zhangshenjerry
|
54317af6d8
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
10 years ago |
|
zhangshenjerry
|
448cedc842
|
回复的收缩
|
10 years ago |
|
sw
|
59f6ef81cd
|
附件提示框固定位置
|
10 years ago |
|
sw
|
ebeeb9cf28
|
开启匿评后学生提交作品提示，开启匿评时对老师的提示
界面css
|
10 years ago |
|
sw
|
e3c67fb17a
|
Merge branch 'szzh' into sw_new_course
|
10 years ago |
|
sw
|
857110d537
|
作品列表增加时间显示，相应界面调整
|
10 years ago |
|
sw
|
810561c31b
|
老师才可以查看缺评情况
|
10 years ago |
|
sw
|
43363e8bcb
|
缺评情况功能
|
10 years ago |
|
sw
|
9a4e0d6be7
|
批阅结果附件显示长度
|
10 years ago |
|
sw
|
ab88156d2f
|
编程作业创建部分值获取
增加、删除编程作业测试结果
样式调整
|
10 years ago |
|
sw
|
c07f66776c
|
课程留言列表，拉长时显示不正确
|
10 years ago |
|
sw
|
57804a118d
|
课程作业列表中展开按钮
|
10 years ago |
 yutao
|
b4732814e6
|
...
|
10 years ago |
|
sw
|
7bab135ac7
|
1、上传资源时公开单选框样式
2、课程上传资源文件有下拉条
|
10 years ago |
|
sw
|
89d15e7673
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
09e014b5f7
|
匿评作品列表界面
|
10 years ago |
|
sw
|
1119840e25
|
作品列表界面
|
10 years ago |
|
yutao
|
37347664e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
10 years ago |
|
sw
|
0ff088f96d
|
作品列表增加搜索按钮，取消搜索框手型显示
|
10 years ago |
|
sw
|
d6fb35544e
|
评分作品时提交按钮固定在提交栏的右下角
|
10 years ago |
|
sw
|
6992a50f64
|
作品列表学号显示为灰色，取消连接；作品名称显示为绿色，学生姓名靠左对齐
|
10 years ago |
|
sw
|
3ef46fd8f5
|
11
|
10 years ago |
|
sw
|
82cb7fac50
|
作业上传附件，超过部分以...显示
|
10 years ago |
|
sw
|
cc5171bc1d
|
解决冲突
|
10 years ago |
|
sw
|
e4046851cf
|
1、作品列表 学号、姓名过长会换行
2、作品作业相关数据迁移
3、student_work缺少字段project_id
|
10 years ago |
|
sw
|
b5dc424714
|
bid超过20行才显示更多按钮
|
10 years ago |
|
sw
|
a9235bef2f
|
1、匿评作品列表，得分显示为我的评分
2、匿评作品列表，不是我的作品用户名显示为匿名，学号不显示
|
10 years ago |
|
sw
|
70f14f851d
|
根据作业不同类型、不同阶段、当前用户身份对作品列表进行过滤，以及相关界面功能的过滤
部分界面样式调整
|
10 years ago |
|
sw
|
3f9855f25c
|
老师删除作业功能
|
10 years ago |
|
sw
|
8c6ea88504
|
1、作品列表TAB切换
2、作品界面作业详细信息
3、到处Excel名称
|
10 years ago |
|
sw
|
ee0a9093d3
|
学生作品附件列表显示以及间距调整
|
10 years ago |
|
sw
|
4783bad924
|
1、打分后作品的各项得分数据刷新
2、作品列表样式调整
|
10 years ago |
|
sw
|
fea784cbcc
|
1、添加评分回复路由改变
2、删除回复功能及界面刷新
|
10 years ago |
|
sw
|
2bb59ffd79
|
1、作品评论回复以及相关界面刷新
2、调整回复框宽度
|
10 years ago |
|
sw
|
1ae8c7d234
|
作业评分、上传评阅结果，以及上传结果的显示样式
|
10 years ago |
|
sw
|
f3597d9aa5
|
开启/关闭匿评弹框提示
|
10 years ago |
|
sw
|
8c72df74d6
|
1、增加返回顶部功能
2、点击作品名称，弹出详细信息
3、作品列表信息生成
|
10 years ago |
|
sw
|
faeb06aae8
|
1、更新css文件
2、新建作品功能天津
3、老师新建作业时增加文件的保存
|
10 years ago |
|
sw
|
3b3ca0024d
|
css错误修改
|
10 years ago |
|
sw
|
09b3ba8a6a
|
更新css文件，新建作业静态页面
|
10 years ago |
|
sw
|
659ff254e1
|
background背景图片拉伸
|
10 years ago |
 alan
|
fe92b05026
|
讨论区编辑添加附件
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
6a31a99c93
|
编辑课程讨论区回复时的问题
|
10 years ago |
|
sw
|
d4f73ae472
|
111
|
10 years ago |
|
sw
|
5f6f7b7cdf
|
引用功能图片显示不正常
|
10 years ago |
|
sw
|
ee051f6a37
|
1、课程讨论区回复取消功能
2、课程讨论区回复时不现实主题
|
10 years ago |
|
alan
|
3b58810528
|
修改课程讨论区的js
Signed-off-by: alan <547533434@qq.com>
|
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
|
6bbf8c8f45
|
课程通知、课程留言取消按钮删除编辑器内内容
|
10 years ago |
|
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传，可上传批改后的作业
2、修改作业列表作业数不显示
|
10 years ago |
|
sw
|
f67bdae22a
|
课程讨论去引用、回帖不换行
|
11 years ago |
whimlex
|
19fe973b5b
|
上传头像
|
11 years ago |
|
whimlex
|
36f2643ad8
|
上传logo
|
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 |
|
sw
|
9f862ad7a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
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 |
|
sw
|
b040981c22
|
调整course.css
|
11 years ago |
|
sw
|
11a4febecb
|
调整course.css
|
11 years ago |
|
sw
|
65bcaef911
|
修改TAG云样式
|
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
|
9905f91228
|
修改TAG云的显示样式
|
11 years ago |
|
whimlex
|
d79de0a354
|
课程日期控件样式冲突
|
11 years ago |
|
sw
|
898d15aa7a
|
更新course.css文件
|
11 years ago |
|
sw
|
400d1a147d
|
课程新编辑器导致图片超出页面
|
11 years ago |
|
sw
|
6abdc4c7e1
|
课程成员配置界面，显示学生真实姓名，无真实姓名的蔡先生login
|
11 years ago |
|
sw
|
c5b55042d4
|
1、修复课程讨论区引用功能
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
|
11 years ago |
|
sw
|
dae907d0b8
|
1、课程通知无法添加评论
2、课程通知界面显示
3、课程通知评论取消按钮
|
11 years ago |
|
sw
|
15567e7d7b
|
1、新的编辑起未对其
2、老师新建作业增加marting-bottom
|
11 years ago |
|
sw
|
0bea5dbb4e
|
修改课程动态标题a标签过长
|
11 years ago |
|
huang
|
df43274565
|
新版项目界面（部分未完成，先合并）
1、项目框架整理
2、各页面样式
|
11 years ago |
|
sw
|
b971147aa8
|
1、添加通知会alert
2、添加通知描述样式
3、通知添加评论样式
|
11 years ago |
|
sw
|
94ecc3e59e
|
1、课程新增成员分页控件样式
2、课程老师列表翻页不可用
|
11 years ago |
|
sw
|
ed02959e00
|
修改成员角色
|
11 years ago |
|
sw
|
083a3b9de6
|
1、课程成员列表显示昵称
2、添加课程成员功能
|
11 years ago |
|
sw
|
98bf8dd494
|
课程成员列表显示
|
11 years ago |
|
z9hang
|
35e0f73345
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
cc2cce22cf
|
讨论区附件样式修改
|
11 years ago |
|
sw
|
61ddfc6363
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
1c53731966
|
留言框样式调整
|
11 years ago |
|
sw
|
1e3b28d4bd
|
修改上传图片样式
|
11 years ago |
|
z9hang
|
e6e1d5342f
|
图片预览框样式问题
|
11 years ago |
|
sw
|
9629e3be11
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
65824be778
|
修改css
|
11 years ago |
|
z9hang
|
15f0058374
|
修正课程资源界面搜索按钮样式
|
11 years ago |
|
sw
|
240fc240e6
|
修改默认图片
修改上传按钮样式
|
11 years ago |
|
sw
|
8c795edf9e
|
解决冲突
|
11 years ago |
|
sw
|
fcbcdffa44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/courses.css
|
11 years ago |
|
sw
|
519c119543
|
修改上传文件样式
|
11 years ago |
|
z9hang
|
d8da3bb73c
|
课程通知列表显示多一个空行问题
|
11 years ago |
|
z9hang
|
b8ab3770f1
|
资源样式冲突调整
|
11 years ago |
|
z9hang
|
a59677c22e
|
课程通知展开信息按钮显示隐藏控制
|
11 years ago |
|
z9hang
|
e1afdab988
|
留言样式修改
|
11 years ago |
|
z9hang
|
57dad3f3c7
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
8ef9779b46
|
修正课程讨论区样式。修正项目讨论区被影响的样式
|
11 years ago |
|
sw
|
090190f3e6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
c8a08d5a56
|
1、切换分班功能
2、非老师用户不能编辑、删除分班
|
11 years ago |
|
z9hang
|
132287d6e1
|
课程通知界面完善
|
11 years ago |
|
z9hang
|
30cb622abd
|
评论显示页面修改
|
11 years ago |
|
sw
|
e465d66689
|
上传资源样式没了。。
|
11 years ago |
|
sw
|
746a7902c5
|
更新css文件
|
11 years ago |
|
z9hang
|
09991b9cf7
|
课程资源模块弹框样式调整
|
11 years ago |
|
sw
|
61d7d65b55
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
app/views/courses/_courses_jours.html.erb
|
11 years ago |
|
sw
|
bcf9d5919c
|
1、处理部分a标签调用js函数时会刷新页面的BUG
2、修改弹出框样式，制作弹出框demo
|
11 years ago |
|
z9hang
|
8190d0cecc
|
修改留言页面样式
|
11 years ago |
|
z9hang
|
19eaa012b7
|
讨论区样式调整
|
11 years ago |
|
z9hang
|
64d208555e
|
样式调整
|
11 years ago |
|
z9hang
|
cb278e65a2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/javascripts/course.js
public/stylesheets/courses.css
|
11 years ago |
|
sw
|
06c5739767
|
更新css以及上传图片
|
11 years ago |
|
z9hang
|
aaf14d5d1a
|
修改课程通知页面
|
11 years ago |
|
z9hang
|
49f11642ad
|
调整资源模块样式
|
11 years ago |
|
sw
|
90df8056c8
|
1、修改分页控件中省略号颜色
2、更新样式文件
3、修改课程首页用新建问卷换行
|
11 years ago |
|
sw
|
258d9bf33a
|
1、调整分页控件显示样式
2、修改课程动态分页算法
3、更新样式文件
|
11 years ago |
|
sw
|
b9ed34f86e
|
1、右边内容区域、增加js：最短为左侧长度
2、修改课程首页动态显示
3、修改course.css文件
|
11 years ago |
|
sw
|
78a7764de0
|
更新css文件并上传缺失图片
|
11 years ago |
|
sw
|
d2c7861706
|
1、添加缺少图片
2、修改意见反馈框默认为关闭
3、修改css中部分图片链接错误
|
11 years ago |
|
sw
|
747a109638
|
1、添加CSS文件
2、调整首页HTML
3、去掉base_header中没用的erb语句
|
11 years ago |
