 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 |
|
alan
|
fb398904b6
|
优化《学生列表》分页查询
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
afbcc3f8d3
|
1.#1742 首次加载课程实践平台主页时，点击“加入课程”快捷通道，课程ID默认是当前登录用户名，口令默认为当前登录用户密码
2.修改加入课程弹出框样式
|
11 years ago |
|
alan
|
329be27567
|
增加《分班查询》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
2e1387b9e4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
d2aef552e6
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
f549530744
|
取消课程动态中描述显示为最多30个字母或汉字的限制
|
11 years ago |
|
sw
|
9545b1da0c
|
优化课程成员列表访问效率
|
11 years ago |
|
alan
|
0e7f7a4254
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
819c4c0bc1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/users_controller.rb
|
11 years ago |
|
sw
|
e6aab5baf2
|
#1650 老师应该可以删除自己课程的留言，或帖子
|
11 years ago |
|
alan
|
629641d065
|
《调整学生列表页面》和《优化个人主页查询》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
6c09228139
|
根据凌彬设计修改学生列表样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
683acfcafc
|
优化《学生列表作业评分查询太慢》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
49cb52146f
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
815d2ceb3d
|
添加《添加相同组时应该给出相关提示信息》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
ff49fbe5c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
4e2fe44d10
|
修改js验证事件，由失去焦点事件改为文本改变事件
|
11 years ago |
|
alan
|
1965b75d92
|
添加《学生列表按作业评分排序》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
6b2fb87b2c
|
修改《教师列表出现作业积分》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
4220573425
|
修改《关于添加分班的问题：老师添加分班成功后，再次添加分班时输入框中记录的是上次分班名称》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
36b7c9ca90
|
修改部分页面导航栏点击课程实践报404
|
11 years ago |
|
alan
|
c602f4b97f
|
修改《课程--学生列表--添加分班：当输入组名为9个汉字时，如图，当前分班显示与搜索框显示不合适》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
0442ccd365
|
修改学生列表参数获取不正确
|
11 years ago |
|
sw
|
cf5b03a379
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/courses/_member_list.html.erb
|
11 years ago |
|
sw
|
410d61022b
|
#1692
1.新建、修改作业时点击是否启用匿评选择框js的修改
2.修改匿评分配数量提示有歧义的问题
|
11 years ago |
|
alan
|
90a01c8d84
|
对新增功能《添加学生列表班内搜索和课内搜索》样式微调
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
d8a568e685
|
增加《分班搜索学生》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5c33c578bb
|
增减功能《课程分班模块添加当分班中没有学生时，可以删除该分班》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
e6efa0f483
|
修改《点击分班，搜索栏不见了》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
47da84dee0
|
修改查询学生后查询框消失的BUG
|
11 years ago |
|
sw
|
b51cd1aabb
|
取消教师列表的搜索功能
|
11 years ago |
|
alan
|
b5d007ccf7
|
增加《点击分组名，该分组名底色发生改变》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
fbe6ce16d7
|
修改《分组界面》样式
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
62497913d7
|
修改《分组名可以为空格》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
63a9fcd483
|
修改《加入分组后分组人数未改变》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
747fb84ef6
|
修改《添加，修改分组名》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
c5a7baa454
|
修改合并引起的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
9d0e39e708
|
修改孙涛提出的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
020242a8c9
|
增减《查询显示人数以及显示全部人数》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
cfb8edbfe2
|
分组功能样式微调
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
c9b84d0a35
|
增加《学生加入，退出分组》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
66f93150f6
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
|
11 years ago |
|
alan
|
9765f11f7e
|
增加<修改，添加分组>功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
3d12d6f0e8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
Conflicts:
db/schema.rb
|
11 years ago |
|
alan
|
615bc7d444
|
增加课程分组的功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
19b61118ac
|
修改加入按钮失败后变为加入课程按钮
|
11 years ago |
|
alan
|
63c9804da8
|
添加course_group表单到数据库中，并建立对应于members和courses之间的关联，
对相应页面的修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 zhuhao
|
21c1b63c6d
|
新建作业和留言两处的提交按钮样式统一
|
11 years ago |
|
sw
|
86413df277
|
#1624 新建课程/课程配置：”学时总数“后面显示两个学时
|
11 years ago |
|
sw
|
e68900b9a0
|
#1616 修改课程时开课日期选项错误
|
11 years ago |
|
sw
|
3e3d103828
|
1.增加开启匿评之后学生能提交作业
2.修改学生作业编辑和删除样式
|
11 years ago |
|
sw
|
f1aca94a30
|
老师配置课程时成员列表显示异常
|
11 years ago |
|
sw
|
ea19c1aeef
|
取消教师评分所占比例选项
|
11 years ago |
|
sw
|
1adb5925b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
972b788687
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
public/stylesheets/application.css
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
b2ce8c78bd
|
<修改资料>页面<课程成员><admin/settings>页面样式修改，注册后页面跳转路由修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
91cb6e29d5
|
数据库增加是否开启匿评字段
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
|
11 years ago |
|
sw
|
2de2355e5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
3ac023e7a5
|
悬浮框增加屏幕绝对定位
问题：貌似IE6不兼容
|
11 years ago |
moon
|
e0571a888e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
moon
|
e359b987e5
|
增加“课程作业”权限提示
|
11 years ago |
|
sw
|
90f5cd2e60
|
修改缩放html页面时悬浮框位置显示不正确的BUG
|
11 years ago |
|
sw
|
3aaf2247dc
|
修改作业右侧悬浮框css、js
|
11 years ago |
|
moon
|
c086009313
|
国际化
|
11 years ago |
|
moon
|
34d7208deb
|
课程联系界面
|
11 years ago |
|
z9hang
|
096b0e271f
|
课程页面页脚偏移问题
|
11 years ago |
|
z9hang
|
ae19532601
|
修改帮助的浮动边框
|
11 years ago |
|
zhuhao
|
b1e58f3fd5
|
新增弹框
|
11 years ago |
|
z9hang
|
e6aa9d3592
|
修复用户、课程、项目、竞赛、留言模块样式，去除回复时的回复某某字样，及字数控制
|
11 years ago |
|
sw
|
7d93a4e4aa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
11 years ago |
|
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
11 years ago |
|
sw
|
6178919735
|
修改创建课程时当前学期的默认选择设置
|
11 years ago |
|
sw
|
0151caa00c
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
11 years ago |
|
sw
|
55b7d12908
|
增加判断：匿评分配数量必须大于0
|
11 years ago |
|
sw
|
54a9044679
|
修改匿评个数可配置、以及增加其相关js验证
|
11 years ago |
|
z9hang
|
7d4d3f590c
|
项目、课程、竞赛留言模块分页控件修复
|
11 years ago |
|
sw
|
cf952b5012
|
Merge branch 'Homework' into develop
|
11 years ago |
|
z9hang
|
07c21e97d6
|
修复竞赛、课程、项目留言模块样式
|
11 years ago |
|
sw
|
4d1730f92e
|
修改
|
11 years ago |
|
alan
|
495c4db43e
|
增加功能<增加学生列表是否公开功能>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
52dabc6b98
|
1.取消新建、修改作业时互评功能的添加
2.格式化页面代码、取消删除老师布置作业按钮
|
11 years ago |
|
alan
|
cbc2d2e99d
|
修改bug<course主页-加入课程，建议修复“取消”按钮样式与“加入”保持一致>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
7e8ab97713
|
作业描述最大长度限制为3000个字符
|
11 years ago |
|
alan
|
72ed73fb05
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
z9hang
|
0a1713da20
|
课程列表中，自己的课程没星号标志问题
|
11 years ago |
|
sw
|
526b34d623
|
修改加入课程弹出框样式
|
11 years ago |
|
alan
|
66aa72d210
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
efc247f2e7
|
1、各个页面在，没有数据情况下的显示调整。2、点击竞赛列表，在没有竞赛的情况下显示的是无搜索结果界面修正为列表界面
|
11 years ago |
|
sw
|
0d0a16fdcd
|
编辑冲突
|
11 years ago |
|
alan
|
6e77c5a0b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/my_controller.rb
app/views/contestnotifications/index.html.erb
app/views/courses/_join_private_course.html.erb
app/views/wiki/edit.html.erb
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
69dc22e218
|
#1247修复项目--配置--版本：新建版本，输入“wiki页面”为非汉字类型且字数较多时，显示异常的BUG
|
11 years ago |
|
sw
|
877c041516
|
修复当课程不存在时提示有误的BUG
|
11 years ago |
|
sw
|
34c7b47580
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 gonglexin
|
0ba1477f1b
|
#1360 翻页或搜索之前若已经选择了用户数据则给出提示信息
|
11 years ago |
|
gonglexin
|
b84e19846b
|
#1360 删除成员时给出确认是否删除的提示信息
|
11 years ago |
|
sw
|
87788ab34c
|
代码优化
|
11 years ago |
|
sw
|
216537a844
|
#1278修改课程列表中单位名称为开设课程的单位
|
11 years ago |
|
sw
|
09f6adbd8d
|
1.修复点击作业左边工作单位会跳入正式版该学校课程列表的BUG
2.格式化页面代码
|
11 years ago |
|
sw
|
a001f85502
|
#1379
1.隐藏作业类型
2.取消无效作业描述
|
11 years ago |
|
sw
|
898fe7e9c9
|
#982修复注册时无法选择工作单位的BUG
修复学校列表显示异常的BUG
|
11 years ago |
|
sw
|
90d4140a25
|
#1377 当指定ID不存在时，给出该课程不存在的提示
|
11 years ago |
|
sw
|
ef48fec26b
|
优化加入课程弹出框显示样式
|
11 years ago |
|
sw
|
98c2313a66
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
ef10ccb76f
|
增加未登录用户不可通过首页加入课程按钮加入相应课程
|
11 years ago |
|
z9hang
|
2cabec22f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
258967263e
|
1、代码优化。2、很多页面标题不正确问题
|
11 years ago |
|
sw
|
6a33934122
|
1.优化加入课程页面
2.增加是否已经加入课程的判断
|
11 years ago |
|
sw
|
b696aa3362
|
修改加入课程界面
|
11 years ago |
|
sw
|
4c41c10e0d
|
首页增加加入课程按钮，用户可以输入课程ID以及课程密码加入对应的课程，已过期课程会给出对应提示
|
11 years ago |
|
z9hang
|
fadddcc09a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
76bab839c7
|
1、根据代码评审修改代码。2、修正部分页面标题。
|
11 years ago |
|
sw
|
2780cd6317
|
修改课程列表查询结果右下角显示不正确的问题
|
11 years ago |
|
sw
|
864d969c15
|
#1173 重启课程、关闭课程、加入课程、退出课程等按钮页面的刷新
|
11 years ago |
|
sw
|
3dd14b6112
|
暂时取消课程列表到处功能
|
11 years ago |
|
sw
|
395ae35a0e
|
#1148 调整所有日期为选择，不可手动输入
|
11 years ago |
|
sw
|
c51f13a0b6
|
#1340 修复360安全浏览器中课程动态显示错误
解决方案：修改页面css
|
11 years ago |
|
sw
|
f83668bf73
|
修改作业界面、功能修改以及增加js验证
|
11 years ago |
|
sw
|
26550bf0a0
|
1.国际化代码
2.项目讨论区标题省略号出现不正确的BUG
|
11 years ago |
|
sw
|
978c883f6e
|
国际化代码
|
11 years ago |
|
z9hang
|
2f2c6c39b5
|
去掉教师列表的学号
|
11 years ago |
|
sw
|
2ce07955c1
|
修复课程角色不能修改的BUG
|
11 years ago |
|
sw
|
ca519ce22d
|
教师用户查看课程学生列表时显示真实姓名
|
11 years ago |
|
alan
|
43e940eb1d
|
修复竞赛作品附件删除报错的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
57835abb37
|
1.增加管理员不能退出项目
2.增加退出项目时的提示
|
11 years ago |
|
sw
|
f477f45dec
|
页面修改
|
11 years ago |
|
sw
|
e1675c4009
|
课程动态显示增加自动换行
|
11 years ago |
|
sw
|
567d929781
|
新建、修改课程课程标题最大长度限定为100
|
11 years ago |
|
z9hang
|
f13eb73a72
|
label写错纠正，一个写死的主页链接纠正
|
11 years ago |
|
z9hang
|
e0cdcc0211
|
课程讨论区发帖，添加附件，admin帐户删除附件报错，原因：判断attachment的containers是否为课程的时候少判断了课程讨论区的附件这种情况，解决：加上该判断。问题2 #1002 forge网站的主页项目列表登录前和登陆后，显示的不一样。 解决方法：项目列表、课程列表中的私有项目、私有课程添加私有标志
|
11 years ago |
|
sw
|
fbb19480f5
|
修复火狐不兼容自动换行的问题
|
11 years ago |
|
sw
|
82b23da54b
|
创建作业增加js验证
|
11 years ago |
|
sw
|
7ec103e135
|
#1457 修复课程开课日期无法修改的BUG
优化选择开课时间代码
|
11 years ago |
|
sw
|
589c6d37db
|
取消日期编辑框可手动输入的问题 #1045
|
11 years ago |
|
sw
|
8932633b23
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
136c991060
|
#1413
修复资源名称过长，在课程动态首页会超出边界的问题
|
11 years ago |
 zhanghaitao
|
9bd22b1b99
|
1.#1011 当添加资源标签为多个时，“新增”按钮被掩盖的问题解决
2.课程标签设置JS添加
|
11 years ago |
|
zhanghaitao
|
4905511060
|
#课程起止时间显示Bug的修改
|
11 years ago |
 chenmin
|
bd56286b4e
|
配置课程学时太长bug修复；
|
11 years ago |
