 cxt
|
4e04df7a8a
|
分组作业的动态显示及关联项目
|
2015-12-09 16:33:48 +08:00 |
|
cxt
|
53f9141cf1
|
分组作业动态
|
2015-12-09 10:29:54 +08:00 |
|
cxt
|
a9f6e817b4
|
分组作业关联项目
|
2015-12-08 17:37:15 +08:00 |
|
cxt
|
cb7ad682cf
|
Merge branch 'develop' into cxt_course
|
2015-12-07 15:21:43 +08:00 |
|
cxt
|
8e999ed9f0
|
作业动态的回复删除功能只在鼠标进入时显示
|
2015-12-07 15:18:32 +08:00 |
|
cxt
|
73e9a00a1a
|
作业动态添加回复的删除功能
|
2015-12-07 11:25:41 +08:00 |
|
cxt
|
a62ecc10ad
|
作业动态设置评分后无法刷新
|
2015-12-07 10:54:18 +08:00 |
|
cxt
|
b61a0a98e5
|
Merge branch 'develop' into cxt_course
Conflicts:
app/views/student_work/new.html.erb
app/views/users/_user_homework_form.html.erb
db/schema.rb
public/stylesheets/courses.css
|
2015-12-07 09:47:18 +08:00 |
 lizanle
|
dbfc4969e0
|
测验消息bug
|
2015-12-04 15:36:19 +08:00 |
|
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
2015-12-04 10:59:14 +08:00 |
|
lizanle
|
6553559929
|
发送消息
|
2015-12-04 10:56:16 +08:00 |
|
cxt
|
77e96af78f
|
还原分组作业
|
2015-12-03 10:41:27 +08:00 |
|
cxt
|
9c4c90e066
|
Merge branch 'develop' into cxt_course
|
2015-12-03 09:55:18 +08:00 |
|
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
2015-12-03 09:17:36 +08:00 |
|
lizanle
|
adb246f9ad
|
注释标记 错误
<!-- -->
|
2015-12-02 15:30:07 +08:00 |
|
lizanle
|
9fe5cfbf76
|
资源发送课程发送项目自动搜索
|
2015-12-02 14:38:41 +08:00 |
|
lizanle
|
2f0895c2c2
|
发送资源成功给出提示
发送资源默认为发送课程
|
2015-12-02 13:40:53 +08:00 |
|
cxt
|
ae218fa86c
|
发布作业时添加分组作业
|
2015-12-02 11:14:46 +08:00 |
|
lizanle
|
304cc078a7
|
去掉警示的感叹号
|
2015-12-01 15:30:47 +08:00 |
|
lizanle
|
1c3bff0007
|
资源库的删除bug
和右键菜单的bug
和变背景色的bug
|
2015-11-30 10:39:50 +08:00 |
|
lizanle
|
cb910b8d4a
|
系统消息添加logo
|
2015-11-27 17:02:37 +08:00 |
 Tim
|
64d4789150
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/user_organizations.html.erb
|
2015-11-24 15:06:19 +08:00 |
|
Tim
|
269d2f992e
|
组织列表搜索框调整后注释
|
2015-11-24 15:02:25 +08:00 |
 ouyangxuhua
|
68bb142278
|
解决组织bug:动态过滤，点击“展开更多”，有通知等其他动态
|
2015-11-23 17:29:55 +08:00 |
|
ouyangxuhua
|
d2a87127da
|
我的组织搜索功能显示
|
2015-11-23 09:32:03 +08:00 |
|
Tim
|
1aa7599771
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-20 14:31:10 +08:00 |
|
Tim
|
e3d78bf4f0
|
组织样式更改
|
2015-11-20 14:30:54 +08:00 |
|
ouyangxuhua
|
0c891236a8
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/projects/settings/_join_org.html.erb
|
2015-11-19 10:44:30 +08:00 |
|
ouyangxuhua
|
8e359c3d94
|
隐藏我的组织的搜索功能
|
2015-11-18 17:27:29 +08:00 |
|
lizanle
|
7ad2e657eb
|
提示信息去掉感叹号
|
2015-11-17 10:34:59 +08:00 |
|
lizanle
|
1961868e5e
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-17 10:20:05 +08:00 |
|
lizanle
|
6af8bfef37
|
加入课程的相关系统提示加上logo
|
2015-11-17 10:19:48 +08:00 |
|
ouyangxuhua
|
d220dbbc9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-16 15:45:18 +08:00 |
|
ouyangxuhua
|
de32745eef
|
1.将项目动态数据迁移至组织动态；
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
|
2015-11-16 15:02:57 +08:00 |
|
cxt
|
c50bcf9331
|
对于提交已截止的作业，作业状态由“作品提交中”改为“作品补交中”
|
2015-11-16 10:56:00 +08:00 |
|
ouyangxuhua
|
36b3d0b636
|
修复火狐浏览器上动态显示文章的bug
|
2015-11-13 20:22:13 +08:00 |
|
cxt
|
82541cae1c
|
新建作业时去掉发布日期和截止日期的label
|
2015-11-13 17:57:32 +08:00 |
|
ouyangxuhua
|
78e1ae4188
|
Merge branch 'szzh' into dev_hjq
Conflicts:
db/schema.rb
|
2015-11-13 17:27:33 +08:00 |
|
ouyangxuhua
|
022c656db6
|
修复项目加入组织的bug
|
2015-11-13 17:19:17 +08:00 |
|
ouyangxuhua
|
3451ced888
|
添加我的组织页面及修改bug
|
2015-11-13 16:34:00 +08:00 |
|
lizanle
|
78ebeaee3b
|
批量删除提示修改
|
2015-11-13 15:38:16 +08:00 |
|
lizanle
|
465bc9bd6c
|
新增和删除的时候数据联动bug
|
2015-11-13 15:04:50 +08:00 |
|
lizanle
|
28a6e09edd
|
资源批量删除情况
|
2015-11-13 14:56:18 +08:00 |
|
cxt
|
2c5cd1a4b3
|
编辑作业页面添加截止日期和发布日期label
|
2015-11-12 18:14:56 +08:00 |
|
cxt
|
ab868d7b65
|
课程通知增加置顶
|
2015-11-12 16:52:42 +08:00 |
|
lizanle
|
a01de011ca
|
文件上传的 确定按钮的联动
|
2015-11-11 16:02:37 +08:00 |
|
lizanle
|
d13205bd3d
|
文件正在上传提示
|
2015-11-11 11:39:02 +08:00 |
|
lizanle
|
3c93103bc7
|
迟交提示，老师名称要给称呼
|
2015-11-09 15:59:24 +08:00 |
|
lizanle
|
7bd9c5b65c
|
更改时区设置
作业发布消息添加发布时间
|
2015-11-09 15:55:55 +08:00 |
|
lizanle
|
20b49385de
|
更改时区设置
作业发布消息添加发布时间
|
2015-11-09 15:36:32 +08:00 |