 guange
|
c1ed8bd36d
|
#2096 course、forge的邮件通知系统，改为可以每日一报、一事一报、不报
|
2015-03-29 12:33:33 +08:00 |
|
guange
|
f139427f03
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/controllers/zipdown_controller.rb
app/views/bids/_homework_list.html.erb
config/routes.rb
db/schema.rb
public/javascripts/attachments.js
|
2015-03-27 18:17:46 +08:00 |
 lizanle
|
04c064ddc8
|
nothing
|
2015-03-26 16:22:16 +08:00 |
|
guange
|
15accd7d9f
|
下载功能优化, 功能已实现
|
2015-03-25 10:41:42 +08:00 |
|
lizanle
|
0c86ba210d
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
db/schema.rb
|
2015-03-17 09:38:24 +08:00 |
|
lizanle
|
a9cafb2241
|
新建DiscussDemo表
|
2015-03-16 15:25:22 +08:00 |
 z9hang
|
8190403380
|
app添加忘记密码接口，课程动态接口代码优化（去掉其中的中文）
|
2015-03-12 16:33:31 +08:00 |
 alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 10:52:20 +08:00 |
|
z9hang
|
c1c05067e7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/admin_controller.rb
db/schema.rb
|
2015-03-06 15:36:47 +08:00 |
 sw
|
26081c6120
|
新建项目时增加不选择所属组织
|
2015-03-06 09:27:43 +08:00 |
|
z9hang
|
3334299808
|
app版本管理功能（表添加，页面部分添加）
|
2015-03-05 17:37:33 +08:00 |
|
lizanle
|
7ee58d1d44
|
项目动态重写，并去掉首页缓存
|
2015-03-04 15:32:00 +08:00 |
|
alan
|
f2a3ce0ece
|
修改《网页标题显示为“中国高校”不合适》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-30 16:05:36 +08:00 |
 huang
|
d0a675f2b8
|
企业版模块
|
2015-01-30 14:11:35 +08:00 |
|
z9hang
|
222e2cc135
|
修改ErrorHandler未能加载问题
|
2015-01-28 09:25:58 +08:00 |
|
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
2015-01-23 16:51:40 +08:00 |
|
sw
|
900cff8f8e
|
1、问卷列表界面发布问卷按钮增加问卷标题不能为空的判断
2、去掉错误的插件引用
|
2015-01-23 14:43:40 +08:00 |
|
z9hang
|
3911450787
|
问卷调查简答题输入字符过多显示超边框问题
|
2015-01-23 09:51:36 +08:00 |
|
alan
|
6ccb154cc3
|
课程留言，发邮件给课程所有人
Signed-off-by: alan <547533434@qq.com>
|
2015-01-21 11:33:29 +08:00 |
|
sw
|
750c8d77aa
|
11111
|
2015-01-17 15:21:18 +08:00 |
|
huang
|
34b8ffeb5b
|
tongji
|
2015-01-16 10:51:08 +08:00 |
|
huang
|
2b0775da26
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
db/schema.rb
|
2015-01-14 16:37:45 +08:00 |
|
huang
|
b63b4974eb
|
统计
|
2015-01-14 16:36:30 +08:00 |
|
sw
|
0433f7c87f
|
增加新建单选题功能
|
2015-01-14 15:35:04 +08:00 |
|
z9hang
|
b6826a74d3
|
问卷显示
|
2015-01-14 11:50:59 +08:00 |
|
z9hang
|
60b0743292
|
问卷调查页面在火狐中的显示问题
|
2015-01-14 09:48:19 +08:00 |
|
z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
2015-01-13 15:12:05 +08:00 |
|
sw
|
197068a2e2
|
111
|
2015-01-12 15:44:56 +08:00 |
|
alan
|
9f807438d6
|
教师数目显示：-1 ，同时动态大量不显示。是不是只显示近期3个月的？
Signed-off-by: alan <547533434@qq.com>
|
2015-01-12 14:58:11 +08:00 |
|
sw
|
ee9d82bfc7
|
1.实现文件调查的model、control、view的架构
2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题
|
2015-01-08 17:42:46 +08:00 |
|
sw
|
4c6ade4c08
|
定义各model之间的关系
|
2015-01-08 14:41:28 +08:00 |
|
z9hang
|
b5da95d5ce
|
修改错误
|
2015-01-05 10:15:14 +08:00 |
|
alan
|
c1705bd65b
|
增加《导入student_for_course数据》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-31 17:02:55 +08:00 |
|
alan
|
486f0b69b1
|
数据迁移student_for_course的数据
Signed-off-by: alan <547533434@qq.com>
|
2014-12-31 10:23:21 +08:00 |
|
alan
|
23140307aa
|
实现<去存储过程功能，并修改打分的表更新>
Signed-off-by: alan <547533434@qq.com>
|
2014-12-31 08:48:14 +08:00 |
|
alan
|
ed54248494
|
修改《查找学生信息》bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-30 14:33:46 +08:00 |
|
alan
|
6a86e1c386
|
<分组点击两次>bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-30 14:00:48 +08:00 |
|
alan
|
4f5fe52485
|
基于苏稳添加的字段优化存储过程
Signed-off-by: alan <547533434@qq.com>
|
2014-12-30 09:21:56 +08:00 |
|
alan
|
5874450d14
|
修改《学生列表排序用的存储过程》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-29 22:20:21 +08:00 |
|
sw
|
259799eb89
|
1.增加评分的model
2.修改评分表中为教师评分的历史数据的is_teacher_score的值
|
2014-12-29 11:38:35 +08:00 |
|
sw
|
fa36e6d2b0
|
增加判断评分是不是老师评分的列
|
2014-12-29 10:58:45 +08:00 |
|
sw
|
73afb7e6c8
|
调用作业课程时首先判断该作业的所属课程是否存在
|
2014-12-22 14:15:49 +08:00 |
|
guange
|
03f2c9c192
|
关注返回规范化
|
2014-12-18 13:37:23 +08:00 |
|
sw
|
0d793ee4bc
|
解决冲突
|
2014-12-05 14:48:33 +08:00 |
|
alan
|
3d12d6f0e8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
Conflicts:
db/schema.rb
|
2014-12-03 19:20:25 +08:00 |
|
z9hang
|
29d4266c6c
|
引用次数的统计修改及按引用排序
|
2014-12-02 15:30:32 +08:00 |
|
alan
|
63c9804da8
|
添加course_group表单到数据库中，并建立对应于members和courses之间的关联，
对相应页面的修改
Signed-off-by: alan <547533434@qq.com>
|
2014-12-02 14:41:36 +08:00 |
|
sw
|
bb1c1a0bb0
|
修改部分学生作业评分居然是6分
|
2014-11-27 16:14:00 +08:00 |
|
sw
|
13bf91f954
|
1.修改课程作业列表中、启动、关闭匿评、提交作业、编辑等按钮不见的问题
2.修改匿评、提交评论的样式
|
2014-11-22 15:50:14 +08:00 |
|
sw
|
91cb6e29d5
|
数据库增加是否开启匿评字段
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
|
2014-11-19 10:34:36 +08:00 |