 sw
|
0408cc5150
|
去除无用代码
|
10 years ago |
|
sw
|
5139ac30dc
|
修改老师新建作业界面
|
10 years ago |
 huang
|
dc0c9417e3
|
修改新提交的作业显示在前面
|
10 years ago |
|
sw
|
3418c9ccee
|
1、修改course/homewrok方法
2、修改course的作业列表显示
|
10 years ago |
|
sw
|
258d9bf33a
|
1、调整分页控件显示样式
2、修改课程动态分页算法
3、更新样式文件
|
10 years ago |
guange
|
08eae0e5eb
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
10 years ago |
|
guange
|
ab6c21314d
|
#1503 老师发布的作业可以在课程动态中显示了
|
10 years ago |
 z9hang
|
6ca853edc7
|
1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能
|
10 years ago |
|
sw
|
bbeaa6e80c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
 alan
|
22ac578ede
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
sw
|
d999a9f4a6
|
修复新建课程时报错的BUG
|
10 years ago |
|
z9hang
|
18271946d7
|
作业详情，课程作业列表接口返回数据格式修改（增加了作业作者相关信息）
|
10 years ago |
|
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能，修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
f380d781e7
|
增加根据已有课程复制成新课程的路由以及方法实现
|
10 years ago |
|
alan
|
6f9e2bad63
|
mail weekly
|
10 years ago |
|
alan
|
646678c9db
|
修改《课程--学生列表：输入有效条件获得搜索结果，对搜索结果按积分排序，却自动返回对所有学生排序》bug
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
 lizanle
|
f3f590a834
|
# 这写变量发现没有用而且拖慢速度
#@teachers= searchTeacherAndAssistant(@course)
#@canShowRealName = isCourseTeacher(User.current.id,@course)
|
10 years ago |
|
alan
|
5434a5b087
|
修改《admin可以访问courses和users列表》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
36dfd7c77c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
10 years ago |
|
alan
|
00c0ddc600
|
admin查看course和user列表
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
z9hang
|
4b3621905e
|
修正课程成员搜索bug
|
10 years ago |
|
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
10 years ago |
|
alan
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
alan
|
24a8f4fe7d
|
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
sw
|
750c8d77aa
|
11111
|
11 years ago |
|
z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
|
alan
|
9f807438d6
|
教师数目显示：-1 ，同时动态大量不显示。是不是只显示近期3个月的？
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 |
|
z9hang
|
b711793d7c
|
修正加入课程接口问题
|
11 years ago |
|
sw
|
2277d388c0
|
修改了两处语法错误
|
11 years ago |
|
z9hang
|
f252438f85
|
修改编辑课程接口
|
11 years ago |
|
alan
|
c1705bd65b
|
增加《导入student_for_course数据》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
ba524675e0
|
修改<打分更新表单>bug
Signed-off-by: alan <547533434@qq.com>
|
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 |
|
alan
|
e39e801c61
|
增加《学生列表按作业评分排序功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
fb398904b6
|
优化《学生列表》分页查询
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
329be27567
|
增加《分班查询》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
b79b08fa8f
|
编写《作业查询存储过程》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
d2aef552e6
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
f8dc9dcd35
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/controllers/courses_controller.rb
|
11 years ago |
|
alan
|
b17d4840b1
|
《作业优化》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
9545b1da0c
|
优化课程成员列表访问效率
|
11 years ago |
|
alan
|
0e7f7a4254
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
abdd6458d3
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9han
|
93762e89d3
|
修改加入课程、退出课程接口调用，添加创建课程，编辑课程的参数说明
|
11 years ago |
|
alan
|
683acfcafc
|
优化《学生列表作业评分查询太慢》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
815d2ceb3d
|
添加《添加相同组时应该给出相关提示信息》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
1965b75d92
|
添加《学生列表按作业评分排序》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
=
|
53d85136a3
|
修改课程中一个错误，完善匿评
|
11 years ago |
|
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
=
|
bb23468c7d
|
Merge branch 'szzh' into api
Conflicts:
app/controllers/account_controller.rb
app/controllers/courses_controller.rb
db/schema.rb
|
11 years ago |
|
z9hang
|
95d8c1a09d
|
修改课程成员列表接口，增加权限判断
|
11 years ago |
|
z9hang
|
6c4d358b7e
|
加入课程、退出课程、编辑课程接口
|
11 years ago |
|
z9hang
|
1851181768
|
新建课程接口
|
11 years ago |
|
z9hang
|
73ac2e562d
|
课程通知接口
|
11 years ago |
|
sw
|
d3e7f484ca
|
#1684 某课程主页--不输入搜索条件，直接点击搜索按钮返回404页面
|
11 years ago |
|
z9hang
|
6dc057d03c
|
课程老师、学生接口
|
11 years ago |
|
z9hang
|
2ab2abe9e5
|
课程搜索接口
|
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 |
|
sw
|
060b856b23
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/courses/_member_list.html.erb
|
11 years ago |
|
alan
|
03a8d8ccc9
|
修改《教师列表中不应该有搜索功能》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
b51cd1aabb
|
取消教师列表的搜索功能
|
11 years ago |
|
alan
|
63a9fcd483
|
修改《加入分组后分组人数未改变》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
c5a7baa454
|
修改合并引起的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
0d793ee4bc
|
解决冲突
|
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
|
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 |
|
alan
|
63c9804da8
|
添加course_group表单到数据库中，并建立对应于members和courses之间的关联，
对相应页面的修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
179b6852da
|
修改超级管理员可以访问课程作业列表
|
11 years ago |
moon
|
600afdc6e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
moon
|
e4e4c94d53
|
封掉所有列表入口，及页面中更多入口
|
11 years ago |
|
sw
|
91cb6e29d5
|
数据库增加是否开启匿评字段
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
|
11 years ago |
|
moon
|
f21767cb16
|
增加其他角色新建课程权限
|
11 years ago |
|
sw
|
a24d1493f9
|
1.修复点击课程动态，课程动态tab页不高亮显示
2.修复点击新建作业，课程作业tab页不高亮显示
|
11 years ago |
|
sw
|
6178919735
|
修改创建课程时当前学期的默认选择设置
|
11 years ago |
|
z9hang
|
7d4d3f590c
|
项目、课程、竞赛留言模块分页控件修复
|
11 years ago |
|
sw
|
01120d063d
|
#1127修复发布作业时，菜单栏相关父菜单变色问题
|
11 years ago |
|
sw
|
59c143a9f1
|
修复加入课程逻辑判断有误的问题
|
11 years ago |
|
sw
|
bf49f46b22
|
修复加入课程报错的BUG
|
11 years ago |
|
sw
|
87788ab34c
|
代码优化
|
11 years ago |
|
sw
|
6530c657ee
|
课程allow_join方法增加课程的传入，减少课程获取次数
|
11 years ago |
|
sw
|
22a5d6a6b0
|
修复当课程ID不存在时加入课程按钮报404而不会给出提示的BUG
|
11 years ago |
|
sw
|
90d4140a25
|
#1377 当指定ID不存在时，给出该课程不存在的提示
|
11 years ago |
|
sw
|
98c2313a66
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
f7ac267b42
|
还原修改
|
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 |
|
sw
|
496ad85469
|
1
|
11 years ago |
|
sw
|
6a33934122
|
1.优化加入课程页面
2.增加是否已经加入课程的判断
|
11 years ago |
|
z9hang
|
57776d67c5
|
优化代码
|
11 years ago |
