 guange
|
31c78d295e
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-05 11:46:15 +08:00 |
|
guange
|
86af233042
|
修正autologin多终端登录问题
|
2015-05-05 11:45:58 +08:00 |
 huang
|
76b4ae24da
|
修改邮件邀请--邮件名
修改成用户点击同意按钮后才能加入项目
|
2015-04-30 16:30:02 +08:00 |
|
huang
|
119e540373
|
邮件邀请系统已注册的用户
|
2015-04-30 11:08:36 +08:00 |
|
huang
|
73798a0da4
|
修改邮件两次点击500错误
增加功能：在点击提交时代码后自动创建用户
用户自动登录功能
|
2015-04-30 07:22:47 +08:00 |
|
guange
|
6c6ef757e1
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
2015-04-29 10:43:48 +08:00 |
|
guange
|
2afdd57fb6
|
修复服务器打包乱码问题
|
2015-04-29 10:43:36 +08:00 |
 sw
|
387ab567d2
|
Merge branch 'szzh' into guange_dev
|
2015-04-28 15:06:12 +08:00 |
|
sw
|
9b15cbd6ee
|
1、老师评分、学生匿评增加附件上传，可上传批改后的作业
2、修改作业列表作业数不显示
|
2015-04-28 12:21:35 +08:00 |
|
guange
|
38ec84cde9
|
将删除版本库的操作置入后台
|
2015-04-28 10:33:15 +08:00 |
|
sw
|
b3fb7914e2
|
课程通知评论编辑框不可用，解决方案：编辑跳转到新的页面
|
2015-04-28 10:31:55 +08:00 |
|
sw
|
827d99fce4
|
Merge branch 'szzh' into guange_dev
|
2015-04-27 18:02:35 +08:00 |
|
sw
|
0970182cd5
|
当教师只评分不评论时，学生可以进行回复
修改作业评论回复框样式不正确，修改项目用户反馈框显示不正确
|
2015-04-27 17:25:42 +08:00 |
|
sw
|
f9aaaf38f9
|
打爆下载增加字符集
|
2015-04-27 14:54:01 +08:00 |
|
guange
|
56f6fa0d86
|
设置zip支持unicode
|
2015-04-27 14:36:11 +08:00 |
|
guange
|
24ce5191c3
|
zip打包可能有乱码
|
2015-04-27 12:04:08 +08:00 |
|
sw
|
54ef7e3325
|
修改课程讨论区报错
|
2015-04-24 14:57:44 +08:00 |
|
guange
|
828d2caefa
|
邮件加入三个邮件设置
|
2015-04-23 17:43:10 +08:00 |
|
sw
|
75504139c9
|
删除课程留言时留言数自动刷新
|
2015-04-23 15:25:04 +08:00 |
|
sw
|
cfe0635804
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-23 14:31:01 +08:00 |
|
sw
|
6d058940ec
|
当课程没有讨论区时自动创建其讨论区
|
2015-04-23 11:44:07 +08:00 |
|
huang
|
681546b860
|
缺陷上传附件显示
项目邮件邀（未完成，需切换分支）
|
2015-04-22 16:49:07 +08:00 |
|
sw
|
de192761b8
|
Merge branch 'szzh' into guange_dev
Conflicts:
Gemfile
config/application.rb
|
2015-04-22 14:53:40 +08:00 |
|
guange
|
d2dd77612b
|
将登录默认值改为自动登录
|
2015-04-22 12:42:22 +08:00 |
|
sw
|
09c51d1a87
|
修改创建作业未启用匿评时，所有作业列表看不到
|
2015-04-22 11:44:52 +08:00 |
|
sw
|
d279881daf
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/courses/settings.html.erb
|
2015-04-22 11:14:12 +08:00 |
|
sw
|
7b3edb59b0
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
public/javascripts/course.js
|
2015-04-22 11:11:51 +08:00 |
|
huang
|
ca26b0d819
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/members/create.js.erb
app/views/members/destroy.js.erb
app/views/members/update.js.erb
app/views/users/show.html.erb
public/javascripts/course.js
|
2015-04-22 09:31:13 +08:00 |
|
sw
|
57193b077e
|
作品列表取消分页显示
|
2015-04-21 20:44:27 +08:00 |
 lizanle
|
d6527f1f7e
|
去掉学生列表分页
|
2015-04-21 17:54:49 +08:00 |
|
lizanle
|
da7528c780
|
重定向到项目配置里的新建版本页面
|
2015-04-21 17:10:07 +08:00 |
whimlex
|
84d7e63d54
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-21 15:11:15 +08:00 |
|
whimlex
|
6195f0a150
|
课程动态添加问卷发布，为通过问卷动态访问课程问卷做权限判断
|
2015-04-21 15:10:45 +08:00 |
|
lizanle
|
2987253303
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-21 09:53:22 +08:00 |
|
lizanle
|
3b70ab964d
|
issue过滤
|
2015-04-21 09:53:09 +08:00 |
|
huang
|
4cddb214fd
|
修改资源库站内搜索不能搜索的bug
|
2015-04-21 09:49:10 +08:00 |
|
huang
|
7d87915413
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/views/courses/_course_members.html.erb
app/views/courses/settings.html.erb
app/views/homework_attach/_homework.html.erb
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-04-17 15:07:01 +08:00 |
|
lizanle
|
17838acddb
|
提示信息数组 flatten
|
2015-04-17 14:39:30 +08:00 |
|
lizanle
|
15e54dd765
|
版本 输入名字不能为空
|
2015-04-17 14:21:18 +08:00 |
|
lizanle
|
3620cd99b6
|
去掉错误的符号
|
2015-04-17 12:00:47 +08:00 |
|
sw
|
cdbe95f6ec
|
修改老师配置界面成员搜索
|
2015-04-17 11:48:47 +08:00 |
|
sw
|
9f862ad7a7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-17 11:11:03 +08:00 |
|
lizanle
|
8cee159cb7
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-17 10:38:54 +08:00 |
|
lizanle
|
e4abc86093
|
版本和版本库bug修改
|
2015-04-17 10:38:39 +08:00 |
|
sw
|
a8b1ca10b3
|
1、学生作业 --> 作品
2、学生交了作品之后显示修改作品
|
2015-04-17 10:36:32 +08:00 |
 z9hang
|
8a26fd4343
|
课程配置：成员配置处添加搜素成员功能
|
2015-04-16 17:28:08 +08:00 |
|
huang
|
611952eb05
|
新建项目时候设定默认项目类型
新建项目样式异常调整
|
2015-04-16 16:36:34 +08:00 |
|
lizanle
|
9621c35e8b
|
项目 版本 和 版本库 标签改动
|
2015-04-16 15:08:46 +08:00 |
|
sw
|
05c74960a8
|
1、增加当前选择的TAG云的样式
2、当选择TAG云过滤之后，对TAG进行添加、删除操作时继续选中该TAG
|
2015-04-16 15:01:37 +08:00 |
|
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
2015-04-16 14:59:05 +08:00 |