 lizanle
|
fccbbe6e2b
|
不允许重复发送。但是发送过程不会给予提示。如果课程或者项目或者组织已经有了该资源，那么该资源的更新时间会变化
|
2015-12-31 14:52:50 +08:00 |
|
lizanle
|
57ef7a2d4a
|
发送资源默认为私有的。
|
2015-12-31 12:41:09 +08:00 |
|
lizanle
|
2c7ef034cb
|
资源库更改
|
2015-12-31 12:27:31 +08:00 |
|
lizanle
|
20a03b2386
|
点击展开更多
|
2015-12-31 11:12:00 +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
|
a85a3339bb
|
文件的删除限制加大
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
|
2015-12-30 18:24:07 +08:00 |
|
lizanle
|
c34127f21f
|
文件的删除限制加大
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
|
2015-12-30 18:04:04 +08:00 |
|
lizanle
|
0ef0045941
|
发送功能要添加copy_from
|
2015-12-30 17:39:00 +08:00 |
 ouyangxuhua
|
82b8cb77fd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-30 17:28:04 +08:00 |
 cxt
|
1448c4f90e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-30 17:28:34 +08:00 |
|
lizanle
|
b7eda83def
|
历史资源功能
|
2015-12-30 17:27:44 +08:00 |
|
ouyangxuhua
|
c2c4c032dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-30 17:27:22 +08:00 |
|
ouyangxuhua
|
3deb5aff43
|
资源栏目权限问题
|
2015-12-30 17:25:06 +08:00 |
|
cxt
|
a74cba5190
|
编程作业的迟交扣分有问题
|
2015-12-30 17:21:06 +08:00 |
|
ouyangxuhua
|
e9cedf0eb9
|
删除冗余的迁移文件
|
2015-12-30 17:14:48 +08:00 |
|
ouyangxuhua
|
987b0dd9d2
|
message_id为空的动态不显示
|
2015-12-30 17:02:14 +08:00 |
|
ouyangxuhua
|
c16f99774b
|
1.组织叶底样式错误问题修正
|
2015-12-30 16:57:40 +08:00 |
 Tim
|
d71e8376ae
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2015-12-30 16:05:08 +08:00 |
|
Tim
|
077368f597
|
匿评增加系统评分显示，对应样式调整
|
2015-12-30 16:02:31 +08:00 |
|
cxt
|
e948c94300
|
在线测验的填空题未断网时报网络异常
|
2015-12-30 15:49:16 +08:00 |
|
ouyangxuhua
|
dcfe89c544
|
帖子发送到组织资源栏目，同时增加增删查改功能
|
2015-12-30 15:46:01 +08:00 |
|
cxt
|
9348cc9c24
|
编程作业匿评添加系统评分
|
2015-12-30 15:22:26 +08:00 |
 guange
|
aa951cd7b9
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-30 13:18:40 +08:00 |
|
guange
|
941d6d09d5
|
查看代码在firefox中显示不了的问题
|
2015-12-30 13:18:30 +08:00 |
|
ouyangxuhua
|
d1ebc35e43
|
Merge branch 'develop' into dev_hjq
Conflicts:
db/schema.rb
|
2015-12-30 10:37:28 +08:00 |
|
ouyangxuhua
|
d1c7aad742
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-30 10:36:00 +08:00 |
|
ouyangxuhua
|
40bf109223
|
给资源栏目增加board
|
2015-12-30 10:34:37 +08:00 |
|
lizanle
|
90c63192e6
|
历史资源模型修改
|
2015-12-30 10:32:32 +08:00 |
 huang
|
4f331d95c7
|
课程讨论区、项目讨论编辑的时候显示附件信息不一致问题
|
2015-12-30 10:08:59 +08:00 |
|
lizanle
|
fd4d2910d0
|
课程发送资源 以及 项目发送资源
|
2015-12-30 10:00:45 +08:00 |
|
huang
|
aa87ef6f1b
|
解决Chrome浏览器等比缩放后样式错乱问题
|
2015-12-30 09:40:15 +08:00 |
|
lizanle
|
1d0e6e1c5c
|
课程发送资源 以及 项目发送资源
|
2015-12-30 09:37:16 +08:00 |
|
huang
|
6b4b87ed09
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/organizations/_org_left_subfield_list.html.erb
处理冲突
|
2015-12-29 18:14:22 +08:00 |
|
huang
|
743950d264
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-29 18:13:15 +08:00 |
|
huang
|
0763963ca4
|
格式
|
2015-12-29 18:12:14 +08:00 |
|
ouyangxuhua
|
2cd48a1ca2
|
暂时隐藏帖子发送功能
|
2015-12-29 18:09:27 +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
|
c425106d0b
|
目标地址样式修改
|
2015-12-29 17:26:45 +08:00 |
|
ouyangxuhua
|
d203285cc1
|
Merge branch 'szzh' into dev_hjq
Conflicts:
app/views/organizations/_org_left_subfield_list.html.erb
|
2015-12-29 17:18:21 +08:00 |
|
ouyangxuhua
|
f9de793124
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-29 17:14:13 +08:00 |
|
ouyangxuhua
|
15cff47c92
|
1.转发帖子时，当组织没有资源栏目时，给出提示；
2.组织文章的附件显示在组织动态/组织文章列表中；
|
2015-12-29 17:13:48 +08:00 |
|
lizanle
|
abb19422ff
|
发送资源到组织功能。同时个人资源库也要添加这个功能
|
2015-12-29 17:13:01 +08:00 |
|
ouyangxuhua
|
0cf2279cf5
|
解决一下bug:
1.组织：引用资源至某栏目，若该组织只有一个栏目，且该资源已成功引用至该组织栏目，如图就不要再显示为“选入组织其他栏目”了
2.组织:只有管理员才能关联课程/项目
|
2015-12-29 16:46:20 +08:00 |
|
huang
|
5618fe067a
|
项目分页，点击加载
|
2015-12-29 16:40:07 +08:00 |
|
cxt
|
c3ddbcfddf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-29 16:33:32 +08:00 |
|
cxt
|
5d2c760a8e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-29 16:32:35 +08:00 |
|
cxt
|
605ec52f8a
|
测验答题失败时提示网络异常
|
2015-12-29 16:31:19 +08:00 |
|
ouyangxuhua
|
dd88742b78
|
判断org.org_act_id是否为空
|
2015-12-29 16:00:12 +08:00 |