 ouyangxuhua
|
abf6b5ff70
|
解决base_org上传资源按钮不能正常上传的问题
|
2016-01-04 15:36:02 +08:00 |
|
ouyangxuhua
|
dae07d7e92
|
解决组织页面对齐的问题
|
2016-01-04 11:11:42 +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
|
806e4caf5a
|
1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。
|
2015-12-31 13:26:28 +08:00 |
|
ouyangxuhua
|
2271befedd
|
修正组织部分页面的样式
|
2015-12-31 09:50:41 +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
|
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 |
|
ouyangxuhua
|
c2c4c032dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-30 17:27:22 +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
|
077368f597
|
匿评增加系统评分显示，对应样式调整
|
2015-12-30 16:02:31 +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 |
 huang
|
4f331d95c7
|
课程讨论区、项目讨论编辑的时候显示附件信息不一致问题
|
2015-12-30 10:08:59 +08:00 |
|
huang
|
aa87ef6f1b
|
解决Chrome浏览器等比缩放后样式错乱问题
|
2015-12-30 09:40:15 +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 |
|
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 |
|
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 |
|
ouyangxuhua
|
58edc150e6
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-29 15:50:42 +08:00 |
|
ouyangxuhua
|
2e41e9890a
|
将riserved改成reserved
|
2015-12-29 15:50:29 +08:00 |
|
ouyangxuhua
|
77e0f0cd08
|
转发帖子新建帖子，并更新相关表
|
2015-12-29 15:49:24 +08:00 |
|
huang
|
d6e765cf4a
|
修正讨论区删除跳转
|
2015-12-29 15:46:20 +08:00 |
|
huang
|
41cd038758
|
讨论区帖子添加锁定
|
2015-12-29 15:05:07 +08:00 |
|
cxt
|
179058f1aa
|
学生总成绩不能为负分
|
2015-12-29 14:55:20 +08:00 |
|
huang
|
b6cf709696
|
解决讨论区冲突
|
2015-12-29 11:29:43 +08:00 |
|
huang
|
c29e6f1b14
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/boards/_project_show.html.erb
app/views/boards/_project_show_detail.html.erb
解决冲突
|
2015-12-29 11:09:16 +08:00 |
|
cxt
|
e6ebcb7ac6
|
作品列表页面的截止时间改为提交截止时间/匿评截止时间
|
2015-12-29 11:08:38 +08:00 |
|
huang
|
5060ec26bb
|
项目讨论区
|
2015-12-29 11:04:20 +08:00 |
|
cxt
|
000f40ad42
|
作业动态的截止时间根据作业当前所处状态来确定是提交截止时间还是匿评截止时间
|
2015-12-29 10:59:26 +08:00 |
|
cxt
|
6bdd6d3e03
|
课程添加设置菜单，设置页面的信息更改
|
2015-12-29 10:15:53 +08:00 |
|
ouyangxuhua
|
0d98dba25c
|
解决项目新建帖子中，点击取消按钮没有反应的问题
|
2015-12-29 09:53:44 +08:00 |
|
ouyangxuhua
|
33ea55ecca
|
项目/课程帖子发送弹窗样式修改
|
2015-12-28 17:03:13 +08:00 |
 lizanle
|
174f7c1972
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
app/views/issues/_list.html.erb
|
2015-12-28 16:57:05 +08:00 |