 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 |
|
sw
|
6abdc4c7e1
|
课程成员配置界面，显示学生真实姓名，无真实姓名的蔡先生login
|
11 years ago |
|
huang
|
45fa01c773
|
修改缺陷不能显示的bug
|
11 years ago |
|
guange
|
0325554d24
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
11 years ago |
|
sw
|
ba743c120b
|
1、课程留言回复框大小
2、课程留言有html代码
|
11 years ago |
|
sw
|
d192a564b4
|
课程作业列表、课程动态页面描述出现html标签
|
11 years ago |
|
sw
|
657b022baa
|
修改课程作业显示
|
11 years ago |
|
guange
|
89af4b451b
|
#2100 IE8中，课程--老师发布作业/学生提交作业，上传附件提交不了
|
11 years ago |
|
sw
|
ba4894239c
|
1、部分浏览器下新建课程页面密码默认填写，课时默认填写为登录名
2、修改课程密码显示取消明码显示
|
11 years ago |
|
sw
|
cc6a9d12f1
|
新建课程时显示明码按钮样式
|
11 years ago |
|
huang
|
12eaac5683
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/boards/_project_show.html.erb
public/javascripts/course.js
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
11 years ago |
|
huang
|
df43274565
|
新版项目界面（部分未完成，先合并）
1、项目框架整理
2、各页面样式
|
11 years ago |
|
whimlex
|
2ef224556e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
aa64b47d74
|
资源按时间倒序显示；新建课程设置公开私有属性；课程动态（动态统计主要在作业和作品上存在问题，动态显示在作品和留言中存在权限问题）；课程动态格式调整
|
11 years ago |
|
lizanle
|
ceb6af7365
|
课程相关模块添加编辑器
|
11 years ago |
|
sw
|
4817e2e1a7
|
新建课程取消后返回host_course
|
11 years ago |
|
sw
|
de0403580e
|
新增课程成员时增加默认选项
|
11 years ago |
|
sw
|
ed02959e00
|
修改成员角色
|
11 years ago |
|
sw
|
2af071a92e
|
课程添加成员后js提示
|
11 years ago |
|
sw
|
083a3b9de6
|
1、课程成员列表显示昵称
2、添加课程成员功能
|
11 years ago |
|
sw
|
98bf8dd494
|
课程成员列表显示
|
11 years ago |
|
sw
|
046536230c
|
增加课程配置界面、成员的基本信息以及相关js
|
11 years ago |
|
sw
|
cee08d9c58
|
修改加入课程弹出框样式
|
11 years ago |
|
sw
|
72d683bdb7
|
加入课程与退出课程js刷新
|
11 years ago |
|
sw
|
61ddfc6363
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
sw
|
8374ba1995
|
配置课程是对齐单选框
|
11 years ago |
|
z9hang
|
1c53731966
|
留言框样式调整
|
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
|
a99dda837a
|
课程动态描述过长超出界面
|
11 years ago |
|
sw
|
cba678a357
|
课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
|
11 years ago |
|
sw
|
ed92faaedd
|
关闭课程与重开课程js
|
11 years ago |
|
z9hang
|
2c5c261b70
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
11 years ago |
|
z9hang
|
e1afdab988
|
留言样式修改
|
11 years ago |
|
sw
|
cb1fce32fe
|
配置课程
|
11 years ago |
|
sw
|
8f90fed8be
|
新建课程界面完成
|
11 years ago |
|
sw
|
58d05689ec
|
加入与退出分班是js跳转不正确
|
11 years ago |
|
sw
|
c8a08d5a56
|
1、切换分班功能
2、非老师用户不能编辑、删除分班
|
11 years ago |
|
sw
|
ab7d12e514
|
1、修改、删除分班是js方法重构
2、验证分班名是否重复重构
|
11 years ago |
|
sw
|
cfe487e217
|
搜素学生后内容清空
|
11 years ago |
|
sw
|
41b4d96173
|
修改作业积分排序
|
11 years ago |
|
sw
|
ab3a3a8573
|
学生收索功能
|
11 years ago |
|
sw
|
92808fe8ea
|
完成学生列表界面
|
11 years ago |
|
sw
|
3c224f0ff9
|
修改编辑分组时的样式
|
11 years ago |
|
sw
|
5f41c92cb3
|
学生列表界面静态显示
|
11 years ago |
|
sw
|
9a08daa1d2
|
教师列表界面
|
11 years ago |
|
sw
|
7399c5b55a
|
调整js
|
11 years ago |
|
sw
|
7b379456ed
|
课程作业描述很长时才显示更多按钮
|
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
|
24b22fce9e
|
修正课程留言样回复式与项目等模块留言回复样式冲突问题
|
11 years ago |
|
z9hang
|
8190d0cecc
|
修改留言页面样式
|
11 years ago |
|
sw
|
7970bd6df0
|
1、增加作业截至时间的js显示
2、截止时间到了之后的显示
|
11 years ago |
|
sw
|
221276ba1f
|
增加老师布置作业学生访问的列表
|
11 years ago |
|
sw
|
37bd338311
|
1、老师修改作业增加默认值显示
2、学生提交作业列表修改layout
|
11 years ago |
|
sw
|
f3fefe50f1
|
1、增加flash显示样式
2、修改老师创建作业完成的js
3、修改老师创建作业界面样式
|
11 years ago |
|
sw
|
5139ac30dc
|
修改老师新建作业界面
|
11 years ago |
|
sw
|
36bd04cc7a
|
国际化课程作业列表
|
11 years ago |
|
sw
|
b6b479f6f9
|
1、增加开启关闭匿评时弹框
2、增加js调用是等待的样式
|
11 years ago |
|
sw
|
69d1fdb699
|
111111111111111
|
11 years ago |
|
sw
|
3418c9ccee
|
1、修改course/homewrok方法
2、修改course的作业列表显示
|
11 years ago |
|
sw
|
258d9bf33a
|
1、调整分页控件显示样式
2、修改课程动态分页算法
3、更新样式文件
|
11 years ago |
|
sw
|
b9ed34f86e
|
1、右边内容区域、增加js：最短为左侧长度
2、修改课程首页动态显示
3、修改course.css文件
|
11 years ago |
|
sw
|
d92ac2d909
|
1、课程跳到其他页面后没有分块
2、修改course_show界面
|
11 years ago |
|
whimlex
|
115eb38a02
|
完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签
|
11 years ago |
|
alan
|
646678c9db
|
修改《课程--学生列表：输入有效条件获得搜索结果，对搜索结果按积分排序，却自动返回对所有学生排序》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
2f168dd4d7
|
修改《课程动态》样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
whimlex
|
64cbeddd13
|
项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正
|
11 years ago |
|
whimlex
|
38157e560e
|
课程--资源库--上传资源：当变化屏幕分辨率时，“上传文件”字样显示异常;添加用户或组没有链接;新建课程中，平台按钮样式调整成统一风格;课程主页，竞赛
|
11 years ago |
|
alan
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
d68486669e
|
#1830课程--标签字体压线
|
11 years ago |
|
sw
|
e493ae22cf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
14a1f31a12
|
1、项目动态 -> 近期动态
2、修复新建修改课程时，描述会有一行空白行
|
11 years ago |
|
alan
|
d5100e4808
|
修改《若用户没有填写姓名或者学号，在列表处姓名学号显示不合理》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
fb6c297a37
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
575b641e25
|
merge dev_chuangbin
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
4b9bad0dc5
|
修改《若有某公开课程courseA，在课程主页中搜索courseA跳转到搜索结果界面，相关链接没有对齐》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
2dc626b595
|
修改《学生列表中重名的班名提示报错》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
2262997c31
|
修改《新建课程时：课程名中有空格或者特殊符号会提示名称无效,》
《 缺陷 Trustie-Forge#1782 (已解决): lable标签和对应的显示值之间间距过大的问题，例如个人主页左侧的信息，具体如图所示》
《本地版中关于学生列表的分组出现的问题：当前已存在A组，再次添加A组应给出提示“A组已存在”，该功能目前只有在学生列表首次加载时才正常》
《托管，课程，竞赛主页中任意点击某一项目，进入该项目主页，右上角的搜索按钮风格和大小不统一。》
《进入某竞赛主页，点击创新竞赛链接没反应》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
2277d388c0
|
修改了两处语法错误
|
11 years ago |
|
alan
|
275d691b13
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/controllers/homework_attach_controller.rb
app/views/courses/_member_list.html.erb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
ba524675e0
|
修改<打分更新表单>bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
06d4d2f465
|
修复老师列表加入时间和实际时间未对齐
|
11 years ago |
|
z9hang
|
42b3fd9584
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
23140307aa
|
实现<去存储过程功能，并修改打分的表更新>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
35dce16924
|
课程成员列表excel导出
|
11 years ago |
|
alan
|
6a86e1c386
|
<分组点击两次>bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
36eca5e425
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
e39e801c61
|
增加《学生列表按作业评分排序功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
05b9b26314
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
