 ouyangxuhua
|
abf6b5ff70
|
解决base_org上传资源按钮不能正常上传的问题
|
2016-01-04 15:36:02 +08:00 |
|
ouyangxuhua
|
8dd34f91c3
|
课程/项目配置关联组织，仅关联用户的组织
|
2016-01-04 15:12:38 +08:00 |
|
ouyangxuhua
|
dae07d7e92
|
解决组织页面对齐的问题
|
2016-01-04 11:11:42 +08:00 |
|
ouyangxuhua
|
9c34cf6c3a
|
课程/项目帖子页面，齿轮菜单内容居中显示
|
2015-12-31 15:30:36 +08:00 |
|
ouyangxuhua
|
358510a2e6
|
解决组织配置资源栏目中，增加/删除栏目不能更新的问题
|
2015-12-31 14:55:41 +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 |
 Tim
|
63b7330cd8
|
邮件提交标题中统计数
|
2015-12-31 11:39:00 +08:00 |
|
Tim
|
b380b515c6
|
修改邮件标题统计
|
2015-12-31 11:18:06 +08:00 |
|
ouyangxuhua
|
2271befedd
|
修正组织部分页面的样式
|
2015-12-31 09:50:41 +08:00 |
|
ouyangxuhua
|
68a6f3f7f2
|
1.组织管理员有删除帖子的权限；2.删除帖子后更新org_activities表
|
2015-12-30 18:44:54 +08:00 |
|
ouyangxuhua
|
c2578698f5
|
1.组织管理员有权限访问帖子资源栏目
2.解决组织页面下的帖子样式的bug
|
2015-12-30 18:25:56 +08:00 |
|
ouyangxuhua
|
29c720a8a4
|
1.权限管理问题
|
2015-12-30 17:45:15 +08:00 |
|
ouyangxuhua
|
b1dbe61072
|
Merge branch 'szzh' into develop
|
2015-12-30 17:28:32 +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 |
|
cxt
|
6b8da96205
|
Merge branch 'cxt_course' into szzh
|
2015-12-30 17:28:23 +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
|
86812d7edf
|
Merge branch 'dev_hjq' into szzh
|
2015-12-30 17:27:14 +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 |
|
cxt
|
335ea381b4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2015-12-30 16:28:09 +08:00 |
|
cxt
|
76b95fbf93
|
课程和项目的课程简介默认可显示20行
|
2015-12-30 16:27:56 +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 |
|
guange
|
887d2f9f00
|
添加micros和nubot的链接
|
2015-12-30 13:14:32 +08:00 |
|
cxt
|
53ccd0debe
|
Merge branch 'develop' into cxt_course
|
2015-12-30 11:15:31 +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 |
 huang
|
4f331d95c7
|
课程讨论区、项目讨论编辑的时候显示附件信息不一致问题
|
2015-12-30 10:08:59 +08:00 |
|
huang
|
aa87ef6f1b
|
解决Chrome浏览器等比缩放后样式错乱问题
|
2015-12-30 09:40:15 +08:00 |
|
huang
|
d0d736d55c
|
Merge branch 'szzh' into develop
|
2015-12-29 18:15:00 +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
|
07827d0520
|
Merge branch 'develop' into szzh
|
2015-12-29 18:13:53 +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 |
|
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 |