 huang
|
2efcb5b89a
|
课程讨论区添加展开、收缩
|
2016-01-05 16:05:27 +08:00 |
|
huang
|
dc77eb6ef6
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
2016-01-05 15:59:30 +08:00 |
|
huang
|
be218baa52
|
添加迁移：项目讨论区数据重复问题
|
2016-01-05 15:59:13 +08:00 |
 cxt
|
2b2abd912d
|
Merge branch 'szzh' into cxt_course
|
2016-01-05 15:50:11 +08:00 |
|
cxt
|
0a2d2a539f
|
关联项目的组长名字加个title
|
2016-01-05 15:46:41 +08:00 |
|
cxt
|
6786ef3235
|
Merge branch 'szzh' into cxt_course
|
2016-01-05 15:38:19 +08:00 |
 Tim
|
06fa32f0e2
|
博客高度控制
|
2016-01-05 15:23:37 +08:00 |
|
cxt
|
c4886306d4
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2016-01-05 15:05:51 +08:00 |
|
cxt
|
94eaf608c3
|
Merge branch 'cxt_course' into szzh
|
2016-01-05 15:05:39 +08:00 |
|
huang
|
428eb018a3
|
隐藏注册中“组织一列”
|
2016-01-05 15:02:39 +08:00 |
|
huang
|
1f09817e4d
|
增加课程讨论区/项目讨论展开更多功能
博客列表页面展开更多
统一展开高度为一个屏幕
|
2016-01-05 12:59:59 +08:00 |
 guange
|
1b177a8498
|
默认禁用自动高度
|
2016-01-05 11:55:30 +08:00 |
|
cxt
|
f52dc37a76
|
作业动态添加作品评阅和作品提交消息
|
2016-01-05 11:29:30 +08:00 |
|
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 |