guange
|
b2551f904b
|
组织没有显示的问题
|
2016-02-04 12:51:23 +08:00 |
cxt
|
8b9bcb4719
|
导入题库的搜索不起作用
|
2016-02-01 10:04:07 +08:00 |
ouyangxuhua
|
b7f1177938
|
1.解决组织动态中删除发送过来的帖子报404的问题;2.组织消息的状态能更新
|
2016-01-29 18:11:16 +08:00 |
cxt
|
da81fb533e
|
Merge branch 'ouyang' into szzh
|
2016-01-29 15:45:47 +08:00 |
cxt
|
c942c843b9
|
导入作业增加引用次数
|
2016-01-28 16:27:46 +08:00 |
cxt
|
8cc87c007f
|
导入作业添加作业类型
|
2016-01-28 09:51:05 +08:00 |
cxt
|
ec41cd4318
|
导入共享题库中的作业
|
2016-01-27 17:26:57 +08:00 |
ouyangxuhua
|
135cb410bc
|
1.解决资源过滤中资源总数与资源统计数不一致的问题;2.对栏目的子目录名进行限制,不能是members setting org_document_comments,因为这会引起路由冲突
|
2016-01-27 15:29:15 +08:00 |
cxt
|
520811fdc7
|
留言按回复的更新时间排序
|
2016-01-26 11:17:55 +08:00 |
ouyangxuhua
|
fbff28d70e
|
Merge branch 'develop' into dev_hjq
|
2016-01-26 11:05:25 +08:00 |
cxt
|
945d0a933f
|
项目资源统计为负数
|
2016-01-25 17:34:04 +08:00 |
ouyangxuhua
|
1607508887
|
增加将帖子发送至课程、项目的功能
|
2016-01-25 14:19:39 +08:00 |
huang
|
e063470a57
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-22 17:30:07 +08:00 |
ouyangxuhua
|
594ce8a304
|
修改几个bug
|
2016-01-21 16:57:13 +08:00 |
huang
|
61e67fa7f4
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/views/users/_course_message.html.erb
app/views/users/_project_issue.html.erb
db/schema.rb
|
2016-01-21 16:10:29 +08:00 |
ouyangxuhua
|
b8ae62db84
|
Merge branch 'szzh' into dev_hjq
|
2016-01-21 15:32:18 +08:00 |
huang
|
7de48f143e
|
issue状态修改
|
2016-01-21 10:38:07 +08:00 |
cxt
|
3b180aca90
|
用户个人留言页面的改版
|
2016-01-20 18:37:47 +08:00 |
ouyangxuhua
|
a487d814cf
|
通知分享功能实现
|
2016-01-20 16:24:14 +08:00 |
huang
|
5b9be0bb11
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
db/schema.rb
public/stylesheets/public.css
|
2016-01-08 18:11:54 +08:00 |
ouyangxuhua
|
66bf50098a
|
增加组织/个人屏蔽项目/课程动态功能
|
2016-01-08 14:12:55 +08:00 |
huang
|
0d6ad9ffac
|
修改课程删除后可以显示的问题
|
2016-01-04 17:08:15 +08:00 |
huang
|
470f45becd
|
课程讨论区(未完)
|
2016-01-04 17:05:32 +08:00 |
huang
|
3394af7ad5
|
Merge branch 'develop' into hjq_new_course
|
2016-01-04 10:29:13 +08:00 |
huang
|
0541294c33
|
为解决完:
1、user_message_system附件显示问题
2、issue回复添加附件问题
|
2015-12-31 17:08:27 +08:00 |
lizanle
|
d26b51c982
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
|
2015-12-31 15:44:57 +08:00 |
lizanle
|
fccbbe6e2b
|
不允许重复发送。但是发送过程不会给予提示。如果课程或者项目或者组织已经有了该资源,那么该资源的更新时间会变化
|
2015-12-31 14:52:50 +08:00 |
lizanle
|
57ef7a2d4a
|
发送资源默认为私有的。
|
2015-12-31 12:41:09 +08:00 |
cxt
|
2c5a4f8a13
|
发布和编辑作业时的启用匿评改为禁用匿评,默认不选中
|
2015-12-31 11:36:21 +08:00 |
lizanle
|
be146a9421
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/controllers/organizations_controller.rb
db/schema.rb
public/stylesheets/courses.css
public/stylesheets/public.css
|
2015-12-31 11:11:38 +08:00 |
lizanle
|
b132e8483c
|
个人资源库搜索不到组织资源
|
2015-12-31 09:08:07 +08:00 |
lizanle
|
0ef0045941
|
发送功能要添加copy_from
|
2015-12-30 17:39:00 +08:00 |
cxt
|
a74cba5190
|
编程作业的迟交扣分有问题
|
2015-12-30 17:21:06 +08:00 |
lizanle
|
1d0e6e1c5c
|
课程发送资源 以及 项目发送资源
|
2015-12-30 09:37:16 +08:00 |
lizanle
|
659f322ca2
|
send resource to org
|
2015-12-29 17:58:36 +08:00 |
lizanle
|
1103e7eab4
|
find org where type is Resource
|
2015-12-29 17:38:59 +08:00 |
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
2015-12-29 17:13:01 +08:00 |
cxt
|
7f133c860a
|
发布和编辑作业时可设置是否启用匿评
|
2015-12-25 15:57:30 +08:00 |
cxt
|
0ed58d4898
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-17 19:07:17 +08:00 |
cxt
|
89d3d3821c
|
分组作业的导入
|
2015-12-17 10:38:14 +08:00 |
lizanle
|
88c2db47b7
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/helpers/application_helper.rb
|
2015-12-15 08:48:08 +08:00 |
lizanle
|
85e2eab8c3
|
发送资源
|
2015-12-14 10:57:17 +08:00 |
lizanle
|
c004b05991
|
资源库搜索 sql注入
|
2015-12-14 10:52:19 +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
|
6553559929
|
发送消息
|
2015-12-04 10:56:16 +08:00 |
cxt
|
f90ff781ab
|
学生提交作品页面的合作成员弹窗
|
2015-12-03 09:17:36 +08:00 |
lizanle
|
9fe5cfbf76
|
资源发送课程发送项目自动搜索
|
2015-12-02 14:38:41 +08:00 |
lizanle
|
1c3bff0007
|
资源库的删除bug
和右键菜单的bug
和变背景色的bug
|
2015-11-30 10:39:50 +08:00 |
lizanle
|
4efb660214
|
全站搜索
|
2015-11-26 09:57:53 +08:00 |
ouyangxuhua
|
de32745eef
|
1.将项目动态数据迁移至组织动态;
2.在组织动态中,按时间倒排显示组织动态;
3.增加我的组织中搜索功能。
|
2015-11-16 15:02:57 +08:00 |