 sw
|
a240a2785f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-08-12 16:26:17 +08:00 |
|
sw
|
2f77adfe9c
|
课程动态公共表的完成，去掉课程动态表的与我相关功能，动态的页面显示
|
2015-08-12 16:24:27 +08:00 |
 lizanle
|
fbcd19b54f
|
1.编辑分班的时候编辑框里要有默认是原来的该班级名字
2.课程通知搜索输入空格仍然返回所有的通知
|
2015-08-11 15:00:40 +08:00 |
|
lizanle
|
a282d81551
|
加入课程或者已经加入的课程，提示后进行跳转
|
2015-08-10 15:31:23 +08:00 |
|
sw
|
c200634c27
|
个人主页--课程列表：加入课程失败后，加入课程按钮却能变为提交作业按钮
|
2015-08-01 15:08:11 +08:00 |
 cxt
|
55a7c168b5
|
Merge branch 'szzh' into dev_cxt2
Conflicts:
app/views/users/show.html.erb
|
2015-07-31 15:51:11 +08:00 |
|
sw
|
01bdf5fdca
|
访问他人课程列表，非课程成员的课程显示加入课程，加入课程后界面刷新
|
2015-07-30 11:21:35 +08:00 |
|
cxt
|
6cb3d19584
|
课程列表的课程动态数与实际不符
|
2015-07-30 11:10:49 +08:00 |
|
sw
|
6c894e63ee
|
添加、修改分班的长度限定为20
|
2015-07-24 15:54:09 +08:00 |
|
sw
|
f4786ea71f
|
学生列表加入时间对齐
|
2015-07-23 10:23:27 +08:00 |
|
sw
|
a7666af597
|
Merge branch 'yutao' into szzh
Conflicts:
app/controllers/users_controller.rb
|
2015-07-17 17:38:07 +08:00 |
|
sw
|
fa2dfd0692
|
作品得分弹出框，作业名过长显示问题
|
2015-07-17 14:53:07 +08:00 |
|
sw
|
cf4c6c83d3
|
作业积分改为总分
|
2015-07-10 17:51:45 +08:00 |
 huang
|
40f393a646
|
课程讨论区ajax刷新
|
2015-07-10 16:47:19 +08:00 |
|
huang
|
b089b973ab
|
Merge branch 'szzh' into dev_hjq
|
2015-07-10 15:41:53 +08:00 |
 yutao
|
17a317a87c
|
个人主页弹出框bug
|
2015-07-10 15:01:44 +08:00 |
|
huang
|
4db788c948
|
修改课程讨论区、留言中姓名权限
|
2015-07-10 11:44:54 +08:00 |
 zhangshenjerry
|
bf9e905b57
|
如图，课程学生列表中，编辑分班的输入框和添加分班的输入框同时显示时不合适
|
2015-07-10 10:23:18 +08:00 |
|
yutao
|
5c011fd342
|
个人主页
|
2015-07-09 15:27:49 +08:00 |
|
huang
|
06c2718b54
|
课程、项目留言页面默认字体配置
|
2015-07-09 11:09:29 +08:00 |
|
yutao
|
d882a3c5ee
|
bug#2948:在课程和个人主页模块，被留言的人应该能看到留言人的昵称和真实姓名
|
2015-07-03 15:20:53 +08:00 |
|
sw
|
d196b3930d
|
课程留言显示真实姓名
|
2015-07-02 09:42:35 +08:00 |
|
sw
|
bb9c46a632
|
课程留言回复，回复内容和时间在同一行
|
2015-06-26 16:27:55 +08:00 |
|
sw
|
66eba14dfe
|
课程首页加入课程样式
课程首页 公开资源-->资源
|
2015-06-26 14:46:37 +08:00 |
|
sw
|
1c10775619
|
Merge branch 'guange_dev' into szzh
|
2015-06-19 10:18:24 +08:00 |
|
sw
|
8a3a0af20f
|
学生列表作业积分弹框内容
|
2015-06-18 10:59:18 +08:00 |
 guange
|
f58b530484
|
给课程活动慢加上缓存，并且加入了开关
|
2015-06-18 09:13:20 +08:00 |
|
guange
|
71ae441bfc
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-06-17 17:01:40 +08:00 |
|
guange
|
d793a8119a
|
修改粘图的加载方式
|
2015-06-17 17:01:03 +08:00 |
|
yutao
|
3b3b8661c8
|
bug#2827:IE浏览器：讨论区：点击回复时，编辑器下面会出现内容不能为空
|
2015-06-17 15:42:52 +08:00 |
|
yutao
|
790e1741ab
|
bug#2859:课程留言--二级回复块被挤下来了
|
2015-06-15 13:53:32 +08:00 |
|
sw
|
cc2bd5f7b1
|
作品列表收索时，收索条件内容在课程收索栏
|
2015-06-13 10:55:51 +08:00 |
|
sw
|
d302c7ca86
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-13 10:23:07 +08:00 |
|
yutao
|
e8d9d53bcc
|
bug#2832:讨论区：回复带有图片的内容，在动态查看时，创建时间显示错位。
|
2015-06-13 10:10:36 +08:00 |
|
sw
|
4af3a28eab
|
课程首页：加入课程，加入失败继续显示加入课程弹框
|
2015-06-13 09:59:42 +08:00 |
|
sw
|
90bd3bad58
|
Merge branch 'develop' into szzh
|
2015-06-12 16:36:54 +08:00 |
|
sw
|
c07f66776c
|
课程留言列表，拉长时显示不正确
|
2015-06-12 16:34:25 +08:00 |
|
yutao
|
e138292f2a
|
...
|
2015-06-12 16:31:29 +08:00 |
|
yutao
|
46da84cd81
|
...
|
2015-06-12 15:56:28 +08:00 |
|
sw
|
9938c9f83a
|
课程首页通知不显示附件
|
2015-06-12 14:41:02 +08:00 |
|
yutao
|
3c515dd077
|
...
|
2015-06-12 10:52:15 +08:00 |
|
yutao
|
de3bb64fd9
|
课程讨论区换编辑器
|
2015-06-11 16:24:09 +08:00 |
|
sw
|
f956b27953
|
作业积分显示平均分
|
2015-06-11 15:31:22 +08:00 |
|
sw
|
5d5159f4c7
|
助教也可在个人首页关闭课程
|
2015-06-10 16:58:48 +08:00 |
|
yutao
|
b4732814e6
|
...
|
2015-06-05 16:20:26 +08:00 |
|
yutao
|
a456616212
|
...
|
2015-06-05 10:33:42 +08:00 |
|
yutao
|
8fcf7ac7a8
|
...
|
2015-06-05 10:25:42 +08:00 |
|
yutao
|
85682d6bbc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-05 10:10:14 +08:00 |
|
yutao
|
cd8f3bdea3
|
...
|
2015-06-04 17:49:53 +08:00 |
|
sw
|
89d15e7673
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-06-04 16:56:30 +08:00 |
|
yutao
|
cd0752f5da
|
课程讨论区动态与我相关
|
2015-06-04 15:55:41 +08:00 |
|
sw
|
b7dbaca15b
|
在学生列表，点击学生积分之后，a标签有下划线
|
2015-06-04 10:29:00 +08:00 |
|
sw
|
ae950cf3c0
|
学生评分弹出框缺少关闭按钮
|
2015-06-04 10:10:16 +08:00 |
|
sw
|
faeee5bc0d
|
课程搜索报错
|
2015-06-02 17:17:34 +08:00 |
|
sw
|
e6af34e9f8
|
学生列表显示
|
2015-06-02 16:22:15 +08:00 |
|
sw
|
b935f50b36
|
课程内作业列表、新建作业等路由关闭，相关页面、方法删除
|
2015-06-02 15:20:44 +08:00 |
|
sw
|
b5dc424714
|
bid超过20行才显示更多按钮
|
2015-05-29 18:35:19 +08:00 |
|
guange
|
1fe49c8cb1
|
添加删除作业功能
|
2015-05-27 19:39:06 +08:00 |
|
yutao
|
a7e2e4766a
|
修复bug#2480:course主页查询课程输入关键字“数据库”，如图课程“课程简介”字样被截断了
|
2015-05-22 09:50:20 +08:00 |
|
sw
|
ea1a98f8ac
|
测试版--搜狗浏览器中课程名称显示为当前登录用户的用户名
|
2015-05-15 16:02:33 +08:00 |
 alan
|
e3d277163f
|
修改个人主页的链接
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 16:59:43 +08:00 |
|
alan
|
72ef4e1db4
|
修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题
Signed-off-by: alan <547533434@qq.com>
|
2015-05-14 15:11:20 +08:00 |
|
guange
|
f53691ceed
|
修复不是News的附件显示出错
|
2015-05-13 17:13:22 +08:00 |
|
guange
|
af107d861b
|
将下载信息放到课程动态
|
2015-05-13 16:44:12 +08:00 |
|
guange
|
eb6c3a9377
|
课程搜索很慢，原因是以前成员数计算太复杂
|
2015-05-13 14:58:11 +08:00 |
|
sw
|
db6218a487
|
教师列表界面增加角色显示、教师显示真实姓名
|
2015-05-08 09:54:40 +08:00 |
|
sw
|
2749c4f890
|
课程配置页面，角色改为中文
|
2015-05-08 09:37:57 +08:00 |
|
sw
|
cba473269d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-07 09:31:22 +08:00 |
|
huang
|
fd28310e15
|
修改issue列表太长换行问题
|
2015-05-06 16:37:18 +08:00 |
|
sw
|
cba760b8b0
|
课程、项目搜索提示
|
2015-05-06 15:01:26 +08:00 |
|
sw
|
6bbf8c8f45
|
课程通知、课程留言取消按钮删除编辑器内内容
|
2015-05-06 14:53:25 +08:00 |
|
sw
|
5b5423b8c5
|
修改贴吧新建帖子、回复显示样式的问题
|
2015-04-23 10:47:54 +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 |
|
sw
|
3d8ec17bb1
|
修改学生作业得分列表弹出框样式
|
2015-04-22 11:07:39 +08:00 |
|
sw
|
5385f35aff
|
教师列表删除翻页
|
2015-04-22 09:52:12 +08:00 |
|
lizanle
|
d6527f1f7e
|
去掉学生列表分页
|
2015-04-21 17:54:49 +08:00 |
whimlex
|
0d26f64afd
|
搜索课程——授课时间”与“课程简介”显示异常
|
2015-04-21 16:49:13 +08:00 |
|
sw
|
6df1f55ac4
|
添加课程成员后不自动刷新
|
2015-04-17 16:53:04 +08:00 |
|
sw
|
d5e71e9803
|
增加课程成员收索功能后、添加课程成员，成员列表不自动刷新
|
2015-04-17 16:38:25 +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 |
|
sw
|
cdbe95f6ec
|
修改老师配置界面成员搜索
|
2015-04-17 11:48:47 +08:00 |
 z9hang
|
47e6d5c909
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-04-16 17:28:36 +08:00 |
|
z9hang
|
8a26fd4343
|
课程配置：成员配置处添加搜素成员功能
|
2015-04-16 17:28:08 +08:00 |
|
whimlex
|
ca1e902a8f
|
#2279 搜索课程进入结果页面，如图，建议将“授课时间”与“课程简介”与上面的“课程名称”等信息对齐
|
2015-04-16 16:39:52 +08:00 |
|
sw
|
2db3ab9d13
|
修改课程时增加密码与课时的验证
|
2015-04-16 10:56:48 +08:00 |
|
sw
|
94ca6cd2f9
|
新建课程时增加密码与课时的验证
|
2015-04-16 10:49:58 +08:00 |
|
huang
|
95c5e6ac83
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/helpers/application_helper.rb
app/helpers/files_helper.rb
app/helpers/members_helper.rb
app/models/journals_for_message.rb
app/models/mailer.rb
app/models/user.rb
app/views/attachments/_form.html.erb
app/views/bids/_new_homework_form.html.erb
app/views/boards/_project_show.html.erb
app/views/courses/_courses_jours.html.erb
app/views/courses/feedback.html.erb
app/views/courses/new_homework.html.erb
app/views/courses/settings.html.erb
app/views/issues/_list.html.erb
app/views/issues/new.html.erb
app/views/messages/_project_show.html.erb
app/views/messages/edit.html.erb
app/views/news/_project_news.html.erb
app/views/projects/invite_members.html.erb
app/views/projects/settings/_modules.html.erb
app/views/projects/show.html.erb
config/configuration.yml
config/locales/zh.yml
db/schema.rb
public/assets/kindeditor/kindeditor.js
public/javascripts/course.js
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-04-16 10:26:03 +08:00 |
|
sw
|
1dc8190aa0
|
1、修改无跳转的href链接为javascript:void(0)
2、增加课程资源库的界面
|
2015-04-15 14:53:07 +08:00 |
|
huang
|
0c90f2361d
|
项目用户反馈页面调整
|
2015-04-11 14:25:47 +08:00 |
|
sw
|
434415343c
|
课程留言图片显示问题
|
2015-04-10 17:36:21 +08:00 |
|
sw
|
400d1a147d
|
课程新编辑器导致图片超出页面
|
2015-04-10 15:43:37 +08:00 |
|
sw
|
9ebed65fde
|
课程动态：作业动态url不对
|
2015-04-10 14:36:30 +08:00 |
|
sw
|
5ad1028c49
|
Merge branch 'szzh' into guange_dev
|
2015-04-09 16:05:49 +08:00 |
|
sw
|
6abdc4c7e1
|
课程成员配置界面，显示学生真实姓名，无真实姓名的蔡先生login
|
2015-04-09 14:29:35 +08:00 |
|
huang
|
45fa01c773
|
修改缺陷不能显示的bug
|
2015-04-09 09:22:09 +08:00 |
|
guange
|
0325554d24
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-04-09 09:20:50 +08:00 |
|
sw
|
ba743c120b
|
1、课程留言回复框大小
2、课程留言有html代码
|
2015-04-08 17:58:53 +08:00 |
|
sw
|
d192a564b4
|
课程作业列表、课程动态页面描述出现html标签
|
2015-04-08 14:32:42 +08:00 |
|
sw
|
657b022baa
|
修改课程作业显示
|
2015-04-08 14:24:42 +08:00 |
|
guange
|
89af4b451b
|
#2100 IE8中，课程--老师发布作业/学生提交作业，上传附件提交不了
|
2015-04-08 13:52:52 +08:00 |