sw
|
c4cd61c71b
|
修改学生提交作业界面的layout
|
2015-03-24 10:02:38 +08:00 |
sw
|
0496c33378
|
添加部分方法的注释
|
2015-03-24 09:28:35 +08:00 |
z9hang
|
a2ec9c661a
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-24 08:43:54 +08:00 |
sw
|
584dcabeaa
|
修改学生作业列表弹出框不正确
|
2015-03-23 20:36:52 +08:00 |
sw
|
221276ba1f
|
增加老师布置作业学生访问的列表
|
2015-03-23 20:30:38 +08:00 |
sw
|
0408cc5150
|
去除无用代码
|
2015-03-23 20:01:09 +08:00 |
sw
|
37bd338311
|
1、老师修改作业增加默认值显示
2、学生提交作业列表修改layout
|
2015-03-23 19:55:29 +08:00 |
z9hang
|
cb278e65a2
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/javascripts/course.js
public/stylesheets/courses.css
|
2015-03-23 17:49:18 +08:00 |
sw
|
5139ac30dc
|
修改老师新建作业界面
|
2015-03-23 17:18:58 +08:00 |
z9hang
|
aaf14d5d1a
|
修改课程通知页面
|
2015-03-23 16:53:04 +08:00 |
huang
|
dc0c9417e3
|
修改新提交的作业显示在前面
|
2015-03-21 10:19:58 +08:00 |
z9hang
|
5278d4dd2b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-20 11:37:22 +08:00 |
z9hang
|
4ca5687b3b
|
#2072测试版--项目--问题跟踪:成功新建问题后建议提示信息为“问题已创建”就好
|
2015-03-20 11:37:09 +08:00 |
lizanle
|
cdad43fdfc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-20 11:08:47 +08:00 |
lizanle
|
a4567396e4
|
如果没有上传图片就会报空指针
|
2015-03-20 11:08:27 +08:00 |
sw
|
0c4f88ca29
|
Merge branch 'szzh' into guange_dev
|
2015-03-19 17:43:56 +08:00 |
guange
|
e007920cb6
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
Gemfile
app/views/attachments/_form.html.erb
|
2015-03-19 17:41:45 +08:00 |
sw
|
6edbb3c7ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-19 17:29:17 +08:00 |
sw
|
3418c9ccee
|
1、修改course/homewrok方法
2、修改course的作业列表显示
|
2015-03-19 17:28:36 +08:00 |
dingxu
|
073cb07f70
|
邀请平台用户:角色、用户都为空添加提示、单一角色提示信息修改、
展开条样式修改
|
2015-03-19 17:23:53 +08:00 |
dingxu
|
7b3af413cd
|
邮件邀请加入项目:如果邮箱已被注册或为空时给出提示
|
2015-03-19 16:51:07 +08:00 |
sw
|
46410c8e8d
|
1、修改删除TAG后js刷新页面
2、删除课程TAG时增加提示
|
2015-03-19 16:02:02 +08:00 |
z9hang
|
2a3a70b7d5
|
app接口部分信息国际化
|
2015-03-19 14:41:31 +08:00 |
sw
|
258d9bf33a
|
1、调整分页控件显示样式
2、修改课程动态分页算法
3、更新样式文件
|
2015-03-19 14:30:06 +08:00 |
huang
|
4ae5e2af7c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 15:50:34 +08:00 |
huang
|
6498002c71
|
修改项目文档中附件上传无法保存、附件编辑的时候无法显示的bug
原因:里面逻辑判断错误
|
2015-03-18 15:50:00 +08:00 |
guange
|
c45850eb8a
|
git hook改为异步
|
2015-03-18 14:42:11 +08:00 |
guange
|
dc29ccf3b7
|
1. git仓库新建时加入hook代码
2. 对现有的旧hook代码进行更新的rake任务
|
2015-03-18 11:22:05 +08:00 |
lizanle
|
b4f99c75da
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-18 10:17:33 +08:00 |
lizanle
|
e49bb18b62
|
cotroller修改:删除记录的同时删除对应的文件
|
2015-03-18 10:17:22 +08:00 |
z9hang
|
86c4a7f45d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-18 09:25:46 +08:00 |
z9hang
|
930486d21e
|
#2024 course主页:点击进入非当前用户的所在学校,如图,不显示“我的课程”了
|
2015-03-18 09:25:26 +08:00 |
lizanle
|
41f302c467
|
cotroller修改
|
2015-03-18 08:53:36 +08:00 |
guange
|
6c87cd40c1
|
加入git回调接口
|
2015-03-17 20:52:12 +08:00 |
sw
|
1e897687d0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-17 16:01:45 +08:00 |
z9hang
|
36554aa90a
|
#2041 项目--问题跟踪:成功新建缺陷给出的提示信息错误
|
2015-03-17 10:11:38 +08:00 |
lizanle
|
86020804c9
|
ok
|
2015-03-17 09:42:04 +08:00 |
lizanle
|
33669017bf
|
controller
|
2015-03-17 09:40:31 +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
|
5c4a62dcc4
|
DiscussDemo代码
|
2015-03-16 15:29:13 +08:00 |
sw
|
88d6b25ace
|
1、修改意见反馈图片
2、去掉个人首页权限判断
|
2015-03-16 09:28:18 +08:00 |
guange
|
e798b7242b
|
Merge remote branch 'remotes/origin/szzh' into guange_dev
|
2015-03-15 23:10:48 +08:00 |
guange
|
f3d6d7c384
|
#2037 issue列表默认显示顺序改为最后更新的倒序
|
2015-03-15 16:02:49 +08:00 |
sw
|
e4895731ae
|
Merge branch 'develop' into szzh
|
2015-03-13 17:48:12 +08:00 |
sw
|
e4e56e01b1
|
修改项目邀请用户失败时的提示
|
2015-03-13 17:46:09 +08:00 |
z9hang
|
ff65bf4ba5
|
app自动更新功能功能,无法下载问题修正
|
2015-03-13 17:10:22 +08:00 |
guange
|
08eae0e5eb
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-03-13 11:30:25 +08:00 |
guange
|
ab6c21314d
|
#1503 老师发布的作业可以在课程动态中显示了
|
2015-03-12 21:57:35 +08:00 |
whimlex
|
28321deeb5
|
邮件邀请用户
|
2015-03-12 18:04:12 +08:00 |
sw
|
fd8edc9a02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 17:34:25 +08:00 |
huang
|
96b2627fda
|
修改邮件居中样式及提示
|
2015-03-12 17:22:52 +08:00 |
sw
|
78039a726e
|
Merge branch 'szzh' into guange_dev
|
2015-03-12 17:09:20 +08:00 |
sw
|
d18e9ff66b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-12 16:32:31 +08:00 |
sw
|
312d7660b2
|
增加邀请成功后的提示
邀请成功后跳转页面修改
调整翻页控件的样式
|
2015-03-12 16:32:20 +08:00 |
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
2015-03-12 15:46:24 +08:00 |
huang
|
0ba7ef0560
|
修改邮箱邀请时,邮件为空时提示错误
|
2015-03-12 15:13:41 +08:00 |
sw
|
5340ad7fc1
|
修改组织首页不显示私有项目
|
2015-03-12 10:20:28 +08:00 |
sw
|
b27bb34662
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-03-12 09:00:12 +08:00 |
huang
|
3ee9ac2b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-03-11 16:44:54 +08:00 |
huang
|
8f0af4c00d
|
修改了未登陆情况下通过URL访问不允访问的
|
2015-03-11 16:42:02 +08:00 |
lizanle
|
d7c550b15b
|
给projects项目新建的时候添加创建人
|
2015-03-11 15:51:25 +08:00 |
sw
|
1e262ec731
|
修改项目上传资源链接
|
2015-03-11 15:32:50 +08:00 |
z9hang
|
eec155f077
|
课程资源页面app自动登陆处理
|
2015-03-11 11:22:58 +08:00 |
sw
|
9060c9acbc
|
#1977 项目发布新贴跳转有问题
|
2015-03-11 10:16:06 +08:00 |
guange
|
fd676f13b5
|
#994 作品下载:资源排序修正
|
2015-03-10 21:50:47 +08:00 |
z9hang
|
57ba46ff00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2015-03-10 17:21:59 +08:00 |
z9hang
|
43e9a9a495
|
1、完成手机app版本管理,上传客户端功能。2、手机app检查更新接口完成
|
2015-03-10 17:20:30 +08:00 |
sw
|
138fac9509
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/homework_attach/_jour.html.erb
app/views/homework_attach/_journal_reply_items.html.erb
app/views/homework_attach/_showjour.html.erb
app/views/words/_feedback.html.erb
app/views/words/_journal_reply_items.html.erb
app/views/words/_message.html.erb
|
2015-03-10 17:11:52 +08:00 |
z9hang
|
803f4a3eaf
|
1、部分页面根据apptoken参数自动登录功能添加token是否过期判断。2、版本管理发布新版本信息功能添加
|
2015-03-10 14:41:36 +08:00 |
guange
|
5d1a5a0b11
|
#1738 修复图片下载次数不正确问题
|
2015-03-10 11:50:27 +08:00 |
sw
|
bdd1980876
|
修复个人动态首页报错
|
2015-03-10 11:39:01 +08:00 |
z9hang
|
6ca853edc7
|
1、课程首页2、用户首页3、课程留言页4、发布作业页5、用户的留言页6、为课程作业创建作品页传递apptoken参数时自动登录功能
|
2015-03-09 17:28:17 +08:00 |
sw
|
3af9c63ae0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 16:16:06 +08:00 |
alan
|
838c39da69
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/views/projects/_invite_members_by_mail.html.erb
|
2015-03-07 16:08:54 +08:00 |
alan
|
48ac3dbea8
|
修改《测试版--注册时返回500错误》以及项目邀请时邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 16:07:48 +08:00 |
z9hang
|
0f2ded4d25
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 15:36:16 +08:00 |
z9hang
|
782071ab64
|
显示接口不能用问题,app版本管理部分代码
|
2015-03-07 15:36:00 +08:00 |
sw
|
c6788e2f40
|
修复首页报错
|
2015-03-07 15:30:37 +08:00 |
sw
|
fea7bd6ad1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 14:44:10 +08:00 |
sw
|
945b9ff9cf
|
修复进入我的动态,关注人没有进行权限过滤的BUG
|
2015-03-07 11:38:15 +08:00 |
alan
|
6cf7e156d1
|
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 11:35:57 +08:00 |
sw
|
3e3cde0805
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-07 11:32:28 +08:00 |
sw
|
ff2b4c610c
|
1、修改用户动态每页显示条目不正确
2、用户动态增加新闻、留言等权限判断的补全,以及部分权限判断不正确
|
2015-03-07 11:30:21 +08:00 |
alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 10:52:20 +08:00 |
huang
|
ce792f6ce8
|
修改邮件发送界面
|
2015-03-07 09:32:27 +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 |
z9hang
|
754acc6945
|
移动端版本管理
|
2015-03-06 15:33:59 +08:00 |
huang
|
b2b978d540
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-06 15:27:32 +08:00 |
huang
|
c159bb2c48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/issues/show.html.erb
app/views/layouts/base_projects.html.erb
app/views/projects/_form.html.erb
app/views/projects/new.html.erb
app/views/projects/show.html.erb
|
2015-03-06 15:23:42 +08:00 |
sw
|
a6b3ddcfcb
|
Merge branch 'szzh' into dev_zanle
|
2015-03-06 14:58:49 +08:00 |
huang
|
beac15475d
|
新项目及用户反馈框的修改!!
|
2015-03-06 14:55:21 +08:00 |
lizanle
|
10faab0129
|
新建的项目发布新问题报500
|
2015-03-06 11:53:16 +08:00 |
sw
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
2015-03-06 08:59:29 +08:00 |
sw
|
d947a914cc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-05 17:43:00 +08:00 |
sw
|
e2307366f6
|
实现组织的增、删、改、查功能及相关界面
|
2015-03-05 17:42:31 +08:00 |
z9hang
|
3334299808
|
app版本管理功能(表添加,页面部分添加)
|
2015-03-05 17:37:33 +08:00 |
lizanle
|
8d322edb90
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/views/projects/show.html.erb
|
2015-03-05 17:24:19 +08:00 |
sw
|
3c4b502e97
|
1、修改进入组织主页项目列表显示不正确的问题
2、admin页面增加组织列表显示
|
2015-03-05 17:03:44 +08:00 |
sw
|
5f8595d874
|
admin页面增加组织列表
|
2015-03-05 15:27:22 +08:00 |
sw
|
3b4bf8b99d
|
增加组织的index界面,以及index界面到组织首页的跳转
|
2015-03-05 14:15:07 +08:00 |
sw
|
dead08a0d6
|
添加、修改项目增加所属组织的选择
|
2015-03-05 11:53:28 +08:00 |
sw
|
d1edd86e11
|
1、修改组织首页项目获取
2、修改此组织没有项目时的样式
|
2015-03-05 10:40:10 +08:00 |
z9hang
|
04dea372c5
|
添加意见反馈接口
|
2015-03-05 10:09:19 +08:00 |
lizanle
|
7ee58d1d44
|
项目动态重写,并去掉首页缓存
|
2015-03-04 15:32:00 +08:00 |
sw
|
2c4e864080
|
#1949 学生可以通过url访问老师并未发布的问卷并进行作答
|
2015-03-03 17:53:15 +08:00 |
sw
|
9233213127
|
修复未登录时进入指定学校课程列表显示却是国防科大课程列表的BUG
|
2015-03-03 17:35:46 +08:00 |
sw
|
bbeaa6e80c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-02 17:43:16 +08:00 |
alan
|
22ac578ede
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
config/locales/zh.yml
|
2015-03-02 14:50:10 +08:00 |
alan
|
f374bfd7e2
|
修复《窗口跳转问题》
Signed-off-by: alan <547533434@qq.com>
|
2015-03-02 14:47:50 +08:00 |
sw
|
d999a9f4a6
|
修复新建课程时报错的BUG
|
2015-03-02 14:33:35 +08:00 |
z9hang
|
18271946d7
|
作业详情,课程作业列表接口返回数据格式修改(增加了作业作者相关信息)
|
2015-03-01 17:31:38 +08:00 |
alan
|
aa8f58530c
|
给黄总提供接口
Signed-off-by: alan <547533434@qq.com>
|
2015-02-11 23:34:10 +08:00 |
alan
|
4bfc4493eb
|
添加《邮件周日发送》功能,修改《贴吧》邮件发送策略
Signed-off-by: alan <547533434@qq.com>
|
2015-02-11 20:23:50 +08:00 |
sw
|
f380d781e7
|
增加根据已有课程复制成新课程的路由以及方法实现
|
2015-02-09 10:28:33 +08:00 |
alan
|
7442cc1ca4
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into email_verify
|
2015-02-06 18:19:35 +08:00 |
alan
|
6f9e2bad63
|
mail weekly
|
2015-02-06 18:15:08 +08:00 |
huang
|
59e7f2f28b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-03 15:23:05 +08:00 |
huang
|
8bef9420cf
|
修改企业版中自己能看到自己的私有项目
|
2015-02-03 15:22:45 +08:00 |
sw
|
6226974f0b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-03 11:25:31 +08:00 |
huang
|
56fa330fed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-02-03 11:25:08 +08:00 |
huang
|
26b1f9f433
|
修改企业版中存在的一些bug
最多只显示十个项目
提示的样式
代码优化
|
2015-02-03 11:24:46 +08:00 |
sw
|
320ee9289a
|
#1897 修改点击DTS测试之后,TAB页背景色变化
|
2015-02-03 09:52:35 +08:00 |
alan
|
646678c9db
|
修改《课程--学生列表:输入有效条件获得搜索结果,对搜索结果按积分排序,却自动返回对所有学生排序》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-02-02 17:01:07 +08:00 |
z9hang
|
836be8c75e
|
添加企业首页配置功能
|
2015-01-31 17:14:01 +08:00 |
huang
|
3350bb98b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2015-01-31 15:46:30 +08:00 |
huang
|
523af8b2a9
|
修改企业版结构及列表页面
|
2015-01-31 15:43:35 +08:00 |
sw
|
8289ca6c89
|
11111
|
2015-01-31 11:14:55 +08:00 |
huang
|
768e06ea8a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-30 17:58:58 +08:00 |
huang
|
be9ff9b4bb
|
修改控制器名
解决列表中企业重名的bug
|
2015-01-30 17:58:41 +08:00 |
z9hang
|
d8571ac931
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-30 16:58:18 +08:00 |
z9hang
|
6bd202e80a
|
课程作业列表当当前用户为课程学生时,输出分配给改学生匿评的作业集合
|
2015-01-30 16:58:05 +08:00 |
sw
|
0d6261dfa7
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/controllers/projects_controller.rb
app/helpers/projects_helper.rb
|
2015-01-30 14:38:54 +08:00 |
huang
|
d91c0442d1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-30 14:29:01 +08:00 |
huang
|
29df528af1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
config/routes.rb
|
2015-01-30 14:27:56 +08:00 |
huang
|
d0a675f2b8
|
企业版模块
|
2015-01-30 14:11:35 +08:00 |
lizanle
|
90649209ca
|
封装,简化,重新编排代码格式,并删掉了一些无用的方法代码
|
2015-01-30 13:29:25 +08:00 |
sw
|
87fdd840ec
|
首页加入项目增加已是当前项目的判断
|
2015-01-30 11:39:19 +08:00 |
sw
|
97ec208b1a
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
2015-01-30 10:37:05 +08:00 |
lizanle
|
f3f590a834
|
# 这写变量发现没有用而且拖慢速度
#@teachers= searchTeacherAndAssistant(@course)
#@canShowRealName = isCourseTeacher(User.current.id,@course)
|
2015-01-30 10:27:21 +08:00 |
sw
|
c56f641163
|
修改首页加入项目按钮没反应
|
2015-01-30 09:57:43 +08:00 |
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
2015-01-30 09:05:47 +08:00 |
sw
|
c366cc90e7
|
修改删除问卷后相关BUG
|
2015-01-29 17:33:10 +08:00 |
lizanle
|
3637d1906d
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
config/routes.rb
|
2015-01-28 12:38:32 +08:00 |
alan
|
5434a5b087
|
修改《admin可以访问courses和users列表》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-27 15:29:09 +08:00 |
alan
|
36dfd7c77c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-27 15:12:56 +08:00 |
alan
|
00c0ddc600
|
admin查看course和user列表
Signed-off-by: alan <547533434@qq.com>
|
2015-01-27 15:11:24 +08:00 |
sw
|
950d831108
|
Merge branch 'api' into szzh
|
2015-01-27 14:51:15 +08:00 |
lizanle
|
ff23ecb9a8
|
Merge branch 'szzh' into dev_zanle
|
2015-01-27 14:46:04 +08:00 |
lizanle
|
5afbf6dbca
|
调整了注释
|
2015-01-27 14:19:46 +08:00 |
sw
|
fe06ca503a
|
增加poll colsed_at的赋值
|
2015-01-27 09:55:02 +08:00 |
sw
|
97c7ccac16
|
增加关闭问卷功能
|
2015-01-27 09:45:15 +08:00 |
z9hang
|
4b3621905e
|
修正课程成员搜索bug
|
2015-01-27 09:06:00 +08:00 |
sw
|
d135274281
|
修改重复加入项目提示语
|
2015-01-26 15:41:10 +08:00 |
sw
|
02f01c1aba
|
修改首页加入项目
|
2015-01-23 17:10:21 +08:00 |
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
2015-01-23 16:51:40 +08:00 |
sw
|
dbdae2ac7e
|
问卷编辑页面在发布问卷和点击问卷标题确认增加问卷标题不能为空的提示
|
2015-01-23 14:25:29 +08:00 |
sw
|
016f4f9a0d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-23 14:11:02 +08:00 |
sw
|
6645648027
|
学生是否看到问卷结果老师可配置增加数据库
|
2015-01-23 14:10:38 +08:00 |
lizanle
|
b26f2029ef
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
|
2015-01-23 13:49:13 +08:00 |
alan
|
fdba8ca986
|
修改《邮箱地址真实性验证》《课程分班提示重名出错》《留言模块发送邮件模板功能》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-23 11:46:55 +08:00 |
lizanle
|
df88cb6eba
|
管理员才能查看
|
2015-01-23 11:14:48 +08:00 |
lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
2015-01-23 10:33:07 +08:00 |
alan
|
942035f698
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-23 10:03:45 +08:00 |
alan
|
24a8f4fe7d
|
Signed-off-by: alan <547533434@qq.com>
|
2015-01-23 10:03:00 +08:00 |
sw
|
a0e6b9c2fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2015-01-22 17:51:11 +08:00 |
lizanle
|
4fe8b23069
|
去掉不必要的代码,修改注释,格式
|
2015-01-22 17:50:24 +08:00 |
lizanle
|
8b6750c1ed
|
删除日志修改为只能修改当天的日志:这样子保护原来的日志,又能进行当天的调试
|
2015-01-22 17:04:12 +08:00 |
sw
|
90a81ee1f1
|
增加网站项目首页加入项目的功能
|
2015-01-22 17:03:01 +08:00 |
alan
|
24dfeb1614
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-22 16:32:53 +08:00 |
alan
|
432e3a05f2
|
增加贴吧创建,发帖时发送邮件功能,修改《邮件重发多次》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-22 16:30:21 +08:00 |
sw
|
683625066e
|
修改进入未批列表修改排序后,老师进行评分之后排序会回到默认排序额问题
|
2015-01-22 15:16:15 +08:00 |
sw
|
54c8ee9d4d
|
增加学生答完问卷之后。能看到自己答题结果的功能
|
2015-01-21 17:51:12 +08:00 |
lizanle
|
566f59c49e
|
修改只有管理员才能查看
|
2015-01-22 16:52:09 +08:00 |
lizanle
|
061e4599c3
|
重构,修正了许多的空指针异常
|
2015-01-22 16:45:57 +08:00 |
sw
|
520e9c73aa
|
#1836 未登录或者没有权限访问私有项目时,跳转到403页面
|
2015-01-21 14:30:19 +08:00 |
sw
|
3bdaeb20c2
|
1、修改问卷列表页面样式
2、问卷列表增加发布问卷功能
3、增加js返回方式
4、去掉无用的js函数
|
2015-01-21 11:14:01 +08:00 |
sw
|
402dfc788f
|
修改新建问卷时问卷名称默认为空
|
2015-01-21 09:55:40 +08:00 |
sw
|
4caf6ab5f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-21 09:19:05 +08:00 |
z9hang
|
b949f70c64
|
修改数据格式转换方法
|
2015-01-20 17:42:18 +08:00 |
alan
|
9f36469d39
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2015-01-20 16:34:30 +08:00 |
alan
|
40d6c3b19c
|
添加《邮箱地址验证是否存在及国际化的编写》功能
Signed-off-by: alan <547533434@qq.com>
|
2015-01-20 16:33:59 +08:00 |
sw
|
7b9d88ecfe
|
问卷调查增加重新发布功能
|
2015-01-20 11:42:28 +08:00 |
lizanle
|
4796524a97
|
去掉项目动态查询中过大的时间跨度
|
2015-01-19 15:35:17 +08:00 |
lizanle
|
49ff5659d9
|
系统日志查看相关代码,资源
|
2015-01-19 14:09:53 +08:00 |
sw
|
00633c8331
|
1
|
2015-01-17 19:00:32 +08:00 |
sw
|
750c8d77aa
|
11111
|
2015-01-17 15:21:18 +08:00 |
sw
|
1e8c6374d7
|
Merge branch 'szzh' into Poll
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
2015-01-17 15:03:59 +08:00 |
sw
|
155d48b7cb
|
问卷列表每页显示20个
|
2015-01-17 14:41:33 +08:00 |
alan
|
ade0720331
|
邮件系统界面重置
Signed-off-by: alan <547533434@qq.com>
|
2015-01-17 14:19:54 +08:00 |
sw
|
c43c6a8c3f
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-17 13:56:11 +08:00 |
z9hang
|
05b1b9741b
|
问卷调查页面修改为每页显示5题
|
2015-01-17 13:35:15 +08:00 |
sw
|
629c4aaaa1
|
1、#1814 未发布的问卷显示在学生的问卷总数中
2、修复问卷标题过长,问卷列表显示异常
3、已发布的问卷可以删除
|
2015-01-17 13:30:50 +08:00 |
alan
|
b9ea3e589e
|
修改《邮件系统》页面
Signed-off-by: alan <547533434@qq.com>
|
2015-01-17 11:18:24 +08:00 |
sw
|
ae9856c01a
|
发布时弹出框js、css调整
|
2015-01-16 17:21:33 +08:00 |
sw
|
17b96bdb14
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 15:57:58 +08:00 |
sw
|
79ad33a90f
|
增加发布问卷的路由
|
2015-01-16 15:57:49 +08:00 |
z9hang
|
e49dfefefb
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 15:51:41 +08:00 |
z9hang
|
dd42c89ee6
|
百分比除数为0问题
|
2015-01-16 15:51:26 +08:00 |
huang
|
2cbe801528
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 15:49:41 +08:00 |
huang
|
7177303eeb
|
问卷统计最终效果
|
2015-01-16 15:49:22 +08:00 |
sw
|
d448599664
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 15:34:43 +08:00 |
z9hang
|
b8047bec28
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 15:32:33 +08:00 |
z9hang
|
0a367249ae
|
问卷完成度显示
|
2015-01-16 15:32:09 +08:00 |
sw
|
65a3ddce41
|
1、增加新增单行文字功能
2、修改题目后总是显示为单选题
|
2015-01-16 15:05:30 +08:00 |
huang
|
b53686dfd7
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 11:19:01 +08:00 |
huang
|
eacc1079b0
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
app/controllers/poll_controller.rb
|
2015-01-16 11:18:39 +08:00 |
sw
|
a683acf85c
|
修复新建问卷时刷新页面,会新建一个问卷的BUG
|
2015-01-16 11:05:04 +08:00 |
huang
|
34b8ffeb5b
|
tongji
|
2015-01-16 10:51:08 +08:00 |
sw
|
40d6ebfd88
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-16 10:49:00 +08:00 |
sw
|
9fb0275563
|
1.增加修改单选题时页面js的刷新
2.修改单选题时删除某些选项有误
|
2015-01-16 10:43:05 +08:00 |
z9hang
|
dc2c96f59a
|
提交后的问卷禁止查看与编辑
|
2015-01-16 10:19:38 +08:00 |
sw
|
f41cd0a8ab
|
1.修改单选题业务逻辑处理
2.删除选项时,单选题至少有一个选项
|
2015-01-16 10:11:17 +08:00 |
alan
|
5191411508
|
<邮件加密自动登录功能,邮件附件下载功能>
Signed-off-by: alan <547533434@qq.com>
|
2015-01-15 18:48:19 +08:00 |
z9hang
|
30a058133d
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-15 18:22:38 +08:00 |
z9hang
|
e44cc07f86
|
提交问卷功能
|
2015-01-15 18:22:30 +08:00 |
sw
|
c4bedfb369
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
app/controllers/poll_controller.rb
|
2015-01-15 18:22:05 +08:00 |
sw
|
d55492b07a
|
增加修改单选题的路由、action、以及js
|
2015-01-15 18:17:45 +08:00 |
z9hang
|
77dc9607df
|
简答题答题
|
2015-01-15 17:36:30 +08:00 |
sw
|
5ec2789881
|
删除某一题目后,后面的题目序号自动-1,以及页面js的刷新
|
2015-01-15 17:26:56 +08:00 |
sw
|
3fab26214f
|
删除单选题后页面数据的删除,增加删除题目的路由及相关方法
|
2015-01-15 17:15:29 +08:00 |
sw
|
870f9bba98
|
必答按钮的数据存入
|
2015-01-15 16:50:06 +08:00 |
sw
|
a99d7c5145
|
1、分离出新建问卷问题页面
2、增加修改问题相关路由及action
|
2015-01-15 14:40:17 +08:00 |
z9hang
|
d684acf527
|
多选题答题功能
|
2015-01-15 11:54:30 +08:00 |
sw
|
20c160f03f
|
1、修改标题头、取消修改标题头数据的保存和页面的变更
|
2015-01-15 10:50:08 +08:00 |
z9hang
|
d2fadfda08
|
单选题选择答案
|
2015-01-15 10:11:52 +08:00 |
z9hang
|
8dab2057a9
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
Conflicts:
config/routes.rb
|
2015-01-15 09:42:41 +08:00 |
z9hang
|
6d82e79e7f
|
答题相关方法添加
|
2015-01-15 09:41:19 +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
|
2a23eb8e17
|
1.增加单选题的显示
2.去掉无用页面
|
2015-01-14 16:15:33 +08:00 |
alan
|
2bba0ddd70
|
添加《邮件加入附件下载功能及私有项目自动登录》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-14 16:08:56 +08:00 |
sw
|
0433f7c87f
|
增加新建单选题功能
|
2015-01-14 15:35:04 +08:00 |
sw
|
2af6121f82
|
Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
|
2015-01-14 14:24:08 +08:00 |
sw
|
eb2498c62c
|
1.增加新增单选题、新增选项、删除选项等js
2.修改问卷layout增加
3.增加新增单选题确定按钮的路由以及相关action
|
2015-01-14 14:23:41 +08:00 |
z9hang
|
b6826a74d3
|
问卷显示
|
2015-01-14 11:50:59 +08:00 |
sw
|
311d90d565
|
1.增加点击单选、多选、单行文本、多行文本的js
2.分割问卷标题头
3.增加新增问题的路由及action
|
2015-01-13 20:13:50 +08:00 |
alan
|
2f147dcddd
|
增加《邮件地址自动登录功能》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-13 18:24:14 +08:00 |
sw
|
fc72d6f9a9
|
1.增加问卷统计、问卷答卷等页面跳转,并增加对应路由
2.调整页面样式
3.动态分页
|
2015-01-13 15:59:02 +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
|
a18fa10de5
|
1.增加老师和学生显示界面的区别
2.增加分页的动态显示,以及分页相关css修改
|
2015-01-13 11:44:28 +08:00 |
sw
|
32219bd850
|
增加访问权限控制
|
2015-01-13 10:23:26 +08:00 |
sw
|
d0dc01b992
|
增加问卷修改功能,以及相关js
|
2015-01-12 17:55:22 +08:00 |
z9hang
|
525cf10376
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-12 17:34:51 +08:00 |
z9hang
|
6efe9ff5c6
|
注释掉无用的方法调用
|
2015-01-12 17:34:26 +08:00 |
sw
|
475b046898
|
修改访问poll#index报ArgumentError
|
2015-01-12 16:56:53 +08:00 |
sw
|
1c24a306fe
|
去掉无用的control
|
2015-01-12 16:37:23 +08:00 |
sw
|
c964194d85
|
增加问卷调查相关的路由、action、以及部分对应的页面
|
2015-01-12 16:02:15 +08:00 |
sw
|
9604117e93
|
Merge branch 'develop' into szzh
|
2015-01-12 15:45:53 +08:00 |
alan
|
9f807438d6
|
教师数目显示:-1 ,同时动态大量不显示。是不是只显示近期3个月的?
Signed-off-by: alan <547533434@qq.com>
|
2015-01-12 14:58:11 +08:00 |
sw
|
90349eed5d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-01-10 18:31:06 +08:00 |
sw
|
6fc496c8ee
|
Merge branch 'szzh' into develop
|
2015-01-10 18:22:54 +08:00 |
alan
|
74af44a826
|
修改《修改个人资料页面》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 18:01:41 +08:00 |
sw
|
bf7eaa7a80
|
修复同一个学生提交相同的文件后,打包下载异常的BUG
|
2015-01-10 17:41:50 +08:00 |
sw
|
f101037b26
|
Merge branch 'szzh' into develop
|
2015-01-10 15:59:56 +08:00 |
huang
|
293b3a3b42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-10 15:42:33 +08:00 |
huang
|
f7c1b76b3d
|
用户反馈弹框模块!
|
2015-01-10 15:39:02 +08:00 |
z9hang
|
666facd483
|
Merge branch 'szzh' into develop
|
2015-01-10 14:40:45 +08:00 |
sw
|
f4e30f77cc
|
1.打包下载异常捕获去除
2.打包下载寻找课程、项目方法隐藏
|
2015-01-10 10:55:37 +08:00 |
alan
|
6c9f5136c0
|
修改《竞赛主页显示错误》
Signed-off-by: alan <547533434@qq.com>
|
2015-01-10 10:37:32 +08:00 |
zhuhao
|
92cf3d86cc
|
Merge branch 'develop' into szzh
|
2015-01-09 16:05:38 +08:00 |
sw
|
9ef3849fe3
|
如果缺少某一附件。在下载后的文件增加相关说明文档
|
2015-01-09 15:59:42 +08:00 |
sw
|
82c2a659df
|
修复当作业打包下载时,某一文件不存在时,跳过该文件继续下载其他的文件
|
2015-01-09 15:33:30 +08:00 |
alan
|
53b57d4c53
|
修改《个人主页积分弹框显示错误》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-09 12:29:49 +08:00 |
sw
|
7ae9556404
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-01-08 17:44:17 +08:00 |
sw
|
ee9d82bfc7
|
1.实现文件调查的model、control、view的架构
2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题
|
2015-01-08 17:42:46 +08:00 |
alan
|
2262997c31
|
修改《新建课程时:课程名中有空格或者特殊符号会提示名称无效,》
《 缺陷 Trustie-Forge#1782 (已解决): lable标签和对应的显示值之间间距过大的问题,例如个人主页左侧的信息,具体如图所示》
《本地版中关于学生列表的分组出现的问题:当前已存在A组,再次添加A组应给出提示“A组已存在”,该功能目前只有在学生列表首次加载时才正常》
《托管,课程,竞赛主页中任意点击某一项目,进入该项目主页,右上角的搜索按钮风格和大小不统一。》
《进入某竞赛主页,点击创新竞赛链接没反应》bug
Signed-off-by: alan <547533434@qq.com>
|
2015-01-08 16:16:59 +08:00 |
sw
|
c9de30bd83
|
增加问卷调查相关表,以及对应的model、control、view的文件夹
|
2015-01-08 12:00:43 +08:00 |
z9hang
|
b711793d7c
|
修正加入课程接口问题
|
2015-01-07 11:20:27 +08:00 |
sw
|
2277d388c0
|
修改了两处语法错误
|
2015-01-07 09:37:35 +08:00 |
z9hang
|
f252438f85
|
修改编辑课程接口
|
2015-01-05 17:47:04 +08:00 |
sw
|
805de7fc28
|
修改课程首页课程列表显示策略
|
2015-01-04 13:28:33 +08:00 |
alan
|
c1705bd65b
|
增加《导入student_for_course数据》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-31 17:02:55 +08:00 |
sw
|
fc7447ba6b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-31 16:01:18 +08:00 |
sw
|
9fc7ed8233
|
修复老师第一次评分报错问题的BUG
|
2014-12-31 16:00:45 +08:00 |
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>
|
2014-12-31 15:50:19 +08:00 |
alan
|
ba524675e0
|
修改<打分更新表单>bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-31 15:48:45 +08:00 |
sw
|
77e8d412ea
|
修改评分列表中教师评分未最后一名教师的评分
|
2014-12-31 11:18:22 +08:00 |
sw
|
3dc7c55aef
|
去除评分时部分重复查询
|
2014-12-31 10:45:21 +08:00 |
alan
|
7a727bfed7
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-31 10:23:36 +08:00 |
alan
|
486f0b69b1
|
数据迁移student_for_course的数据
Signed-off-by: alan <547533434@qq.com>
|
2014-12-31 10:23:21 +08:00 |
sw
|
171d743fa1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-31 10:10:31 +08:00 |
sw
|
b79ec2b50f
|
#1761 修复关闭匿评不可用
|
2014-12-31 10:09:00 +08:00 |
z9hang
|
4b923ed483
|
修改导出作品列表的名称
|
2014-12-31 09:48:17 +08:00 |
z9hang
|
42b3fd9584
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-31 09:05:30 +08:00 |
z9hang
|
d3f9f23465
|
修改课程列表导出的文件名
|
2014-12-31 09:05:21 +08:00 |
alan
|
23140307aa
|
实现<去存储过程功能,并修改打分的表更新>
Signed-off-by: alan <547533434@qq.com>
|
2014-12-31 08:48:14 +08:00 |
z9hang
|
35dce16924
|
课程成员列表excel导出
|
2014-12-30 17:49:48 +08:00 |
sw
|
a07bb18dcb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-12-30 15:39:23 +08:00 |
z9hang
|
899ac6f654
|
添加作品列表导出excel功能
|
2014-12-30 14:29:30 +08:00 |
sw
|
ee1df78f13
|
课程、项目首页增加用户姓名、邮箱、昵称等搜索功能
|
2014-12-30 10:57:39 +08:00 |
sw
|
0bce2ae8f3
|
#1752“竞赛通知”,“参加竞赛”时,左侧以及上方布局不同
|
2014-12-30 09:48:30 +08:00 |
alan
|
36eca5e425
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-29 20:46:41 +08:00 |
alan
|
e39e801c61
|
增加《学生列表按作业评分排序功能》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-29 20:46:27 +08:00 |
z9hang
|
058d19f8d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-29 17:45:05 +08:00 |
z9hang
|
61e1f0fa52
|
导出作品列表功能
|
2014-12-29 17:44:39 +08:00 |
sw
|
05b9b26314
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-12-29 17:00:35 +08:00 |
sw
|
70083789cb
|
1.修复匿评列表查询有错
2.修复当身份改变时修改分数初始分数为之前身份的评分,修改为修改之前身份的评分的BUG
3.是否已经评分判断增加在当前角色下是否已经评分
|
2014-12-29 16:59:22 +08:00 |
alan
|
fb398904b6
|
优化《学生列表》分页查询
Signed-off-by: alan <547533434@qq.com>
|
2014-12-29 16:57:31 +08:00 |
sw
|
aa06251fd3
|
修改当用户角色改变时,该用户评分所属角色也跟着改变的BUG
|
2014-12-29 16:03:21 +08:00 |
alan
|
329be27567
|
增加《分班查询》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-26 17:31:01 +08:00 |
alan
|
6192a36481
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-26 15:51:53 +08:00 |
alan
|
b79b08fa8f
|
编写《作业查询存储过程》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-26 15:51:39 +08:00 |
z9hang
|
68cadba317
|
#1710 测试版--项目--作品下载:选择任意内容类型、文件类型,都弹出error的提示框
|
2014-12-26 15:35:38 +08:00 |
alan
|
d2aef552e6
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-26 14:50:14 +08:00 |
alan
|
f8dc9dcd35
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/controllers/courses_controller.rb
|
2014-12-25 10:31:11 +08:00 |
alan
|
b17d4840b1
|
《作业优化》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-25 10:23:59 +08:00 |
sw
|
9545b1da0c
|
优化课程成员列表访问效率
|
2014-12-25 09:02:58 +08:00 |
alan
|
0e7f7a4254
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-24 18:31:45 +08:00 |
alan
|
8e87e83ad8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-24 15:55:16 +08:00 |
alan
|
abdd6458d3
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-24 15:55:08 +08:00 |
sw
|
819c4c0bc1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/users_controller.rb
|
2014-12-24 09:45:23 +08:00 |
sw
|
b512bc53e9
|
修改用户搜索无法精确搜索的bUG
|
2014-12-24 09:08:42 +08:00 |
z9han
|
93762e89d3
|
修改加入课程、退出课程接口调用,添加创建课程,编辑课程的参数说明
|
2014-12-23 11:07:17 +08:00 |
alan
|
b8e00e16df
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-22 17:02:49 +08:00 |
alan
|
629641d065
|
《调整学生列表页面》和《优化个人主页查询》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-22 17:02:32 +08:00 |
z9han
|
67ffc03fee
|
#1708 课程--资源库:非课程成员可以引用私有课程里面的公开资源,改为提示没有权限引用
|
2014-12-22 16:16:33 +08:00 |
sw
|
73afb7e6c8
|
调用作业课程时首先判断该作业的所属课程是否存在
|
2014-12-22 14:15:49 +08:00 |
alan
|
c99af4cb7b
|
修改《个人主页出现没权限访问链接》bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-22 11:26:21 +08:00 |
alan
|
683acfcafc
|
优化《学生列表作业评分查询太慢》功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-22 10:31:09 +08:00 |
alan
|
d81240e63c
|
修改《关注老师后,老师发布的作业都会在我主页的动态中显示出来,若我未加入该课程但感兴趣点击后返回403页面,提示不够人性化》bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-22 01:29:53 +08:00 |
alan
|
815d2ceb3d
|
添加《添加相同组时应该给出相关提示信息》功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-19 23:12:32 +08:00 |
alan
|
f9a86356ad
|
添加《重新发送激活邮件》功能to注册模块
Signed-off-by: alan <547533434@qq.com>
|
2014-12-19 10:51:53 +08:00 |
alan
|
c560ca617b
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-18 18:25:02 +08:00 |
alan
|
1965b75d92
|
添加《学生列表按作业评分排序》功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-18 18:24:37 +08:00 |
=
|
226d5e9889
|
修改作业详、匿评
新增作品留言
|
2014-12-18 17:20:21 +08:00 |
sw
|
b6327460a8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-18 15:49:49 +08:00 |
=
|
53d85136a3
|
修改课程中一个错误,完善匿评
|
2014-12-18 14:48:14 +08:00 |
alan
|
8e592bae98
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-17 17:36:29 +08:00 |
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-17 17:36:12 +08:00 |
=
|
bb23468c7d
|
Merge branch 'szzh' into api
Conflicts:
app/controllers/account_controller.rb
app/controllers/courses_controller.rb
db/schema.rb
|
2014-12-17 16:41:28 +08:00 |
z9han
|
7f9386180d
|
部分接口添加权限验证接口、新闻详情及对应评论接口
|
2014-12-15 16:53:20 +08:00 |
sw
|
5966a1edb6
|
修改老师开启匿评时的提示信息
|
2014-12-15 16:20:58 +08:00 |
sw
|
cf2810f1c6
|
#1712点击打开某竞赛作品,网页名显示为托管项目的名称
|
2014-12-15 15:13:11 +08:00 |
z9hang
|
36967eeec0
|
修改注册接口、添加作业列表接口
|
2014-12-15 13:44:26 +08:00 |
z9hang
|
95d8c1a09d
|
修改课程成员列表接口,增加权限判断
|
2014-12-15 10:41:09 +08:00 |
sw
|
9ffe32e121
|
修改老师第一次可以不对学生作业进行评分,只进行评价
|
2014-12-15 09:10:21 +08:00 |
z9hang
|
c0a0c41e14
|
私有课程的公开资源能下载bug
|
2014-12-12 16:53:49 +08:00 |
sw
|
363e681254
|
修复课程获取出错的BUG
|
2014-12-12 16:52:44 +08:00 |
sw
|
595f6805f9
|
修改删除附件是方法
|
2014-12-12 16:28:37 +08:00 |
z9hang
|
6c4d358b7e
|
加入课程、退出课程、编辑课程接口
|
2014-12-12 14:54:01 +08:00 |
sw
|
b7b1a81a54
|
修改下载附件传入参数有误
|
2014-12-12 09:46:12 +08:00 |
sw
|
f46240a5eb
|
修复学号为空下载附件报错的BUG
|
2014-12-12 09:32:09 +08:00 |
z9hang
|
1851181768
|
新建课程接口
|
2014-12-11 17:11:05 +08:00 |
sw
|
c067d3e4c5
|
修改保存评分时报错
|
2014-12-11 16:09:33 +08:00 |
z9hang
|
73ac2e562d
|
课程通知接口
|
2014-12-11 15:39:14 +08:00 |
sw
|
d3e7f484ca
|
#1684 某课程主页--不输入搜索条件,直接点击搜索按钮返回404页面
|
2014-12-11 15:37:48 +08:00 |
sw
|
e768abbf31
|
修复有时留言回复失败的BUG
|
2014-12-11 09:24:22 +08:00 |
z9hang
|
6dc057d03c
|
课程老师、学生接口
|
2014-12-10 20:53:41 +08:00 |
z9hang
|
1494821b67
|
用户搜索接口
|
2014-12-10 20:27:41 +08:00 |
z9hang
|
2ab2abe9e5
|
课程搜索接口
|
2014-12-10 18:26:38 +08:00 |