 huang
|
680e861620
|
项目资源搜索功能
|
2016-01-05 11:00:26 +08:00 |
|
huang
|
81bb35ac49
|
项目资源库 资源列表
|
2016-01-05 10:01:56 +08:00 |
|
huang
|
ce085a23b0
|
Merge branch 'develop' into hjq_new_course
|
2016-01-04 17:08:42 +08:00 |
|
huang
|
0d6ad9ffac
|
修改课程删除后可以显示的问题
|
2016-01-04 17:08:15 +08:00 |
|
huang
|
470f45becd
|
课程讨论区（未完）
|
2016-01-04 17:05:32 +08:00 |
 guange
|
d2c7d12cd9
|
merge
|
2016-01-04 15:53:56 +08:00 |
|
guange
|
8ea9430318
|
at链接问题修改
|
2016-01-04 15:51:24 +08:00 |
 ouyangxuhua
|
abf6b5ff70
|
解决base_org上传资源按钮不能正常上传的问题
|
2016-01-04 15:36:02 +08:00 |
|
ouyangxuhua
|
8dd34f91c3
|
课程/项目配置关联组织，仅关联用户的组织
|
2016-01-04 15:12:38 +08:00 |
|
huang
|
b79a50ce2f
|
issue回复添加附件
|
2016-01-04 12:33:43 +08:00 |
 cxt
|
3ddbeae100
|
课程的“更多”模式的文字不用粗体
|
2016-01-04 11:32:48 +08:00 |
|
cxt
|
a4a29b0ee9
|
关联项目的文字样式调整
|
2016-01-04 11:26:42 +08:00 |
|
cxt
|
28d491495a
|
Merge branch 'develop' into cxt_course
|
2016-01-04 11:25:43 +08:00 |
|
ouyangxuhua
|
dae07d7e92
|
解决组织页面对齐的问题
|
2016-01-04 11:11:42 +08:00 |
|
huang
|
9e87e63b82
|
系统消息去掉附件
|
2016-01-04 10:36:27 +08:00 |
|
huang
|
3394af7ad5
|
Merge branch 'develop' into hjq_new_course
|
2016-01-04 10:29:13 +08:00 |
|
cxt
|
7f751cfc63
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-31 17:58:59 +08:00 |
|
cxt
|
4d4e91c358
|
Merge branch 'szzh' into develop
|
2015-12-31 17:58:51 +08:00 |
|
huang
|
11444f43f0
|
解决issue多附件，删除一个附件后，提交弹出白色框框的问题
|
2015-12-31 17:55:48 +08:00 |
|
cxt
|
6b5341805e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-31 17:54:04 +08:00 |
|
cxt
|
f0216cf604
|
Merge branch 'cxt_course' into szzh
|
2015-12-31 17:53:52 +08:00 |
|
cxt
|
3dac8d2944
|
课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限
|
2015-12-31 17:53:05 +08:00 |
|
huang
|
0541294c33
|
为解决完：
1、user_message_system附件显示问题
2、issue回复添加附件问题
|
2015-12-31 17:08:27 +08:00 |
 lizanle
|
87b8e4dafc
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-31 17:07:04 +08:00 |
|
lizanle
|
b06bd51347
|
项目资源库更新资源公开私有属性的时候 需要区分 项目课程
|
2015-12-31 17:06:49 +08:00 |
|
ouyangxuhua
|
527897bff0
|
新建组织后，增加默认栏目
|
2015-12-31 16:23:10 +08:00 |
|
ouyangxuhua
|
692f13d1de
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-31 16:12:19 +08:00 |
|
ouyangxuhua
|
defba80427
|
栏目配置中，“设为显示”改成“设为可见"
|
2015-12-31 16:11:48 +08:00 |
|
lizanle
|
a82fef3ea2
|
资源库新上传资源不能被删除
|
2015-12-31 16:08:46 +08:00 |
|
cxt
|
c323e15e2c
|
Merge branch 'szzh' into develop
|
2015-12-31 15:49:14 +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 |
|
cxt
|
9b974b6170
|
Merge branch 'cxt_course' into szzh
Conflicts:
db/schema.rb
|
2015-12-31 15:39:07 +08:00 |
|
cxt
|
7e76a32480
|
项目/课程讨论区的动态增加设置菜单
|
2015-12-31 15:36:42 +08:00 |
|
ouyangxuhua
|
9c34cf6c3a
|
课程/项目帖子页面，齿轮菜单内容居中显示
|
2015-12-31 15:30:36 +08:00 |
|
lizanle
|
c3b7662cac
|
issue按更新时间排序
|
2015-12-31 15:17:48 +08:00 |
|
ouyangxuhua
|
358510a2e6
|
解决组织配置资源栏目中，增加/删除栏目不能更新的问题
|
2015-12-31 14:55:41 +08:00 |
|
lizanle
|
fccbbe6e2b
|
不允许重复发送。但是发送过程不会给予提示。如果课程或者项目或者组织已经有了该资源，那么该资源的更新时间会变化
|
2015-12-31 14:52:50 +08:00 |
|
ouyangxuhua
|
373e40f4fd
|
未登陆情况下，不能发布帖子
|
2015-12-31 14:13:31 +08:00 |
|
ouyangxuhua
|
22be66f85c
|
课程/项目帖子中，用户在登陆情况下即可发送帖子
|
2015-12-31 14:00:33 +08:00 |
|
ouyangxuhua
|
f0111ad79d
|
Merge branch 'develop' into dev_hjq
|
2015-12-31 13:30:07 +08:00 |
|
ouyangxuhua
|
806e4caf5a
|
1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。
|
2015-12-31 13:26:28 +08:00 |
|
lizanle
|
57ef7a2d4a
|
发送资源默认为私有的。
|
2015-12-31 12:41:09 +08:00 |
|
lizanle
|
2c7ef034cb
|
资源库更改
|
2015-12-31 12:27:31 +08:00 |
 Tim
|
63b7330cd8
|
邮件提交标题中统计数
|
2015-12-31 11:39:00 +08:00 |
|
cxt
|
2c5a4f8a13
|
发布和编辑作业时的启用匿评改为禁用匿评，默认不选中
|
2015-12-31 11:36:21 +08:00 |
|
Tim
|
b380b515c6
|
修改邮件标题统计
|
2015-12-31 11:18:06 +08:00 |
|
lizanle
|
b059ab2428
|
schema.rb
|
2015-12-31 11:13:44 +08:00 |
|
lizanle
|
ff88d1ed2c
|
Merge remote-tracking branch 'origin/dev_zanle' into dev_zanle
Conflicts:
db/schema.rb
|
2015-12-31 11:12:32 +08:00 |
|
cxt
|
ec631691e3
|
新建课程和课程配置页面增加结束学期
|
2015-12-31 11:12:09 +08:00 |
|
lizanle
|
20a03b2386
|
点击展开更多
|
2015-12-31 11:12:00 +08:00 |