 dingxu
|
7269217947
|
提交课程作业的页面首次加载显示不正常，作品名称和描述输入框没对齐
|
11 years ago |
|
dingxu
|
dbf4525afc
|
IE浏览器竞赛页面中搜索部分的css乱了
|
11 years ago |
 alanlong
|
864b902d38
|
Signed-off-by: alanlong <547533434@qq.com>
|
11 years ago |
|
alanlong
|
0877123a18
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/application.css
public/stylesheets/scm.css
test/fixtures/activities.yml
test/fixtures/course_infos.yml
test/fixtures/course_statuses.yml
test/fixtures/schools.yml
test/fixtures/user_extensions.yml
test/functional/applied_project_controller_test.rb
test/functional/apply_project_masters_controller_test.rb
test/functional/attachment_type_edit_controller_test.rb
test/functional/contestnotifications_controller_test.rb
test/functional/forums_controller_test.rb
test/functional/memos_controller_test.rb
test/functional/no_uses_controller_test.rb
test/functional/notificationcomments_controller_test.rb
test/functional/open_source_projects_controller_test.rb
test/functional/softapplications_controller_test.rb
test/functional/test_controller_test.rb
test/functional/web_footer_companies_controller_test.rb
test/unit/attachmentstype_test.rb
test/unit/contest_notification_test.rb
test/unit/contesting_softapplication_test.rb
test/unit/contestnotification_test.rb
test/unit/course_group_test.rb
test/unit/course_infos_test.rb
test/unit/course_status_test.rb
test/unit/forum_test.rb
test/unit/helpers/applied_project_helper_test.rb
test/unit/helpers/apply_project_masters_helper_test.rb
test/unit/helpers/attachment_type_edit_helper_test.rb
test/unit/helpers/contestnotifications_helper_test.rb
test/unit/helpers/courses_helper_test.rb
test/unit/helpers/forums_helper_test.rb
test/unit/helpers/memos_helper_test.rb
test/unit/helpers/no_uses_helper_test.rb
test/unit/helpers/notificationcomments_helper_test.rb
test/unit/helpers/open_source_projects_helper_test.rb
test/unit/helpers/school_helper_test.rb
test/unit/helpers/softapplications_helper_test.rb
test/unit/helpers/stores_helper_test.rb
test/unit/helpers/test_helper_test.rb
test/unit/helpers/zipdown_helper_test.rb
test/unit/join_in_contest_test.rb
test/unit/journal_reply_test.rb
test/unit/memo_test.rb
test/unit/no_use_test.rb
test/unit/notificationcomments_test.rb
test/unit/open_source_project_test.rb
test/unit/option_number_test.rb
test/unit/project_score_test.rb
test/unit/relative_memo_test.rb
test/unit/school_test.rb
test/unit/softapplication_test.rb
test/unit/user_score_details_test.rb
test/unit/web_footer_company_test.rb
test/unit/web_footer_oranizer_test.rb
|
11 years ago |
|
alanlong
|
4c56bb3e4d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
public/stylesheets/application.css
public/stylesheets/scm.css
test/fixtures/activities.yml
test/fixtures/course_infos.yml
test/fixtures/course_statuses.yml
test/fixtures/schools.yml
test/fixtures/user_extensions.yml
test/functional/applied_project_controller_test.rb
test/functional/apply_project_masters_controller_test.rb
test/functional/attachment_type_edit_controller_test.rb
test/functional/contestnotifications_controller_test.rb
test/functional/forums_controller_test.rb
test/functional/memos_controller_test.rb
test/functional/no_uses_controller_test.rb
test/functional/notificationcomments_controller_test.rb
test/functional/open_source_projects_controller_test.rb
test/functional/softapplications_controller_test.rb
test/functional/test_controller_test.rb
test/functional/web_footer_companies_controller_test.rb
test/unit/attachmentstype_test.rb
test/unit/contest_notification_test.rb
test/unit/contesting_softapplication_test.rb
test/unit/contestnotification_test.rb
test/unit/course_group_test.rb
test/unit/course_infos_test.rb
test/unit/course_status_test.rb
test/unit/forum_test.rb
test/unit/helpers/applied_project_helper_test.rb
test/unit/helpers/apply_project_masters_helper_test.rb
test/unit/helpers/attachment_type_edit_helper_test.rb
test/unit/helpers/contestnotifications_helper_test.rb
test/unit/helpers/courses_helper_test.rb
test/unit/helpers/forums_helper_test.rb
test/unit/helpers/memos_helper_test.rb
test/unit/helpers/no_uses_helper_test.rb
test/unit/helpers/notificationcomments_helper_test.rb
test/unit/helpers/open_source_projects_helper_test.rb
test/unit/helpers/school_helper_test.rb
test/unit/helpers/softapplications_helper_test.rb
test/unit/helpers/stores_helper_test.rb
test/unit/helpers/test_helper_test.rb
test/unit/helpers/zipdown_helper_test.rb
test/unit/join_in_contest_test.rb
test/unit/journal_reply_test.rb
test/unit/memo_test.rb
test/unit/no_use_test.rb
test/unit/notificationcomments_test.rb
test/unit/open_source_project_test.rb
test/unit/option_number_test.rb
test/unit/project_score_test.rb
test/unit/relative_memo_test.rb
test/unit/school_test.rb
test/unit/softapplication_test.rb
test/unit/user_score_details_test.rb
test/unit/web_footer_company_test.rb
test/unit/web_footer_oranizer_test.rb
|
11 years ago |
 sw
|
a09a3dc378
|
课程首页： 1-3月份显示上一年度的秋季学期的课程， 3-9月份显示本年度的春季学期课程， 9-12月份显示本年度的秋季学期的课程
|
11 years ago |
|
sw
|
805de7fc28
|
修改课程首页课程列表显示策略
|
11 years ago |
|
alan
|
394beedcc2
|
<课程首页>bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
43511c8e97
|
修改《课程首页按年份显示》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
c1705bd65b
|
增加《导入student_for_course数据》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
fc7447ba6b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
9fc7ed8233
|
修复老师第一次评分报错问题的BUG
|
11 years ago |
 z9hang
|
7741e7bd37
|
非当前老师提交的资源显示引入我的其他课程
|
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
|
16201f79cf
|
去掉首页更新提示
|
11 years ago |
|
sw
|
06d4d2f465
|
修复老师列表加入时间和实际时间未对齐
|
11 years ago |
|
sw
|
833155e4e8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
77e8d412ea
|
修改评分列表中教师评分未最后一名教师的评分
|
11 years ago |
|
z9hang
|
ad156079c6
|
修改加错的gem包
|
11 years ago |
|
z9hang
|
2171198ba1
|
恢复被删除的gem包
|
11 years ago |
|
sw
|
3dc7c55aef
|
去除评分时部分重复查询
|
11 years ago |
|
alan
|
7a727bfed7
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
486f0b69b1
|
数据迁移student_for_course的数据
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
171d743fa1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
b79ec2b50f
|
#1761 修复关闭匿评不可用
|
11 years ago |
|
z9hang
|
4b923ed483
|
修改导出作品列表的名称
|
11 years ago |
|
z9hang
|
42b3fd9584
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d3f9f23465
|
修改课程列表导出的文件名
|
11 years ago |
|
alan
|
23140307aa
|
实现<去存储过程功能，并修改打分的表更新>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
35dce16924
|
课程成员列表excel导出
|
11 years ago |
|
sw
|
a07bb18dcb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
d08bce46dd
|
调整页面代码
|
11 years ago |
 =
|
098b8094b1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
=
|
305cbae008
|
维护浮动框
|
11 years ago |
|
alan
|
5c49c9fd4f
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
ed54248494
|
修改《查找学生信息》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
101be35f19
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
899ac6f654
|
添加作品列表导出excel功能
|
11 years ago |
|
sw
|
66d67e2cc9
|
修改通知界面主题最多为60个字符
|
11 years ago |
|
alan
|
6a86e1c386
|
<分组点击两次>bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
933a84f51d
|
项目、课程主页用户搜索后结果界面也支持按姓名、昵称、邮箱搜索
|
11 years ago |
|
sw
|
ee1df78f13
|
课程、项目首页增加用户姓名、邮箱、昵称等搜索功能
|
11 years ago |
|
sw
|
0bce2ae8f3
|
#1752“竞赛通知”，“参加竞赛”时,左侧以及上方布局不同
|
11 years ago |
|
alan
|
4f5fe52485
|
基于苏稳添加的字段优化存储过程
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
5874450d14
|
修改《学生列表排序用的存储过程》
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 |
|
z9hang
|
058d19f8d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
61e1f0fa52
|
导出作品列表功能
|
11 years ago |
