 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
|
583fe55ba2
|
Merge branch 'szzh' into develop
|
2015-12-29 16:33:20 +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
|
3553e34e2e
|
Merge branch 'cxt_course' into szzh
|
2015-12-29 16:32:27 +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 |
|
lizanle
|
6440434428
|
私有课程的资源不允许设置为公开
|
2015-12-28 17:26:29 +08:00 |
|
ouyangxuhua
|
5334a3d40f
|
链接样式还原
|
2015-12-28 17:14:15 +08:00 |
|
ouyangxuhua
|
d77625e4e9
|
Merge branch 'develop' into dev_hjq
|
2015-12-28 17:04:12 +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 |
|
lizanle
|
5ce9a5109d
|
issue存在重复
|
2015-12-28 16:55:46 +08:00 |
|
lizanle
|
e35d2daa0a
|
课程资源库
|
2015-12-28 16:19:30 +08:00 |
|
huang
|
900d7d62cb
|
邮件按天发送添加提示
|
2015-12-28 16:14:32 +08:00 |
|
ouyangxuhua
|
2076c9b449
|
Merge branch 'develop' into dev_hjq
Conflicts:
app/controllers/organizations_controller.rb
app/views/layouts/_footer.html.erb
app/views/layouts/base_org.html.erb
app/views/organizations/_org_activities.html.erb
db/schema.rb
public/stylesheets/new_user.css
public/stylesheets/org.css
public/stylesheets/public.css
|
2015-12-28 15:32:03 +08:00 |
|
cxt
|
7713356d55
|
Merge branch 'szzh' into cxt_course
|
2015-12-28 15:18:01 +08:00 |
|
cxt
|
c821826bd8
|
附件描述-》追加理由
|
2015-12-28 15:17:16 +08:00 |
|
ouyangxuhua
|
ad4816ca4a
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
|
2015-12-28 15:09:56 +08:00 |
|
huang
|
af9bc9a124
|
解决版本库点击新增版本版本信息丢失
|
2015-12-28 15:09:41 +08:00 |
|
huang
|
77722f0211
|
修改issue中ke高度
|
2015-12-28 14:52:36 +08:00 |
|
ouyangxuhua
|
805d785140
|
解决点击转发项目/课程帖子没有反应的问题
|
2015-12-28 14:35:13 +08:00 |
|
cxt
|
7bc030b789
|
组织模块：关联项目弹框的项目列表的高度要限制
|
2015-12-28 11:31:23 +08:00 |
|
lizanle
|
3b08adfc68
|
课程资源页面修改。
|
2015-12-27 23:24:21 +08:00 |
|
huang
|
6504e3d867
|
Merge branch 'szzh' into develop
|
2015-12-25 19:45:34 +08:00 |
|
cxt
|
37aee434e2
|
缺陷动态的回复图片超出边框
|
2015-12-25 19:43:49 +08:00 |
|
huang
|
5ca2896cc4
|
Merge branch 'szzh' into develop
|
2015-12-25 19:03:03 +08:00 |
|
cxt
|
b991dc1edd
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 19:02:34 +08:00 |
|
cxt
|
d2f56693b4
|
课程通知新建报404
|
2015-12-25 19:02:26 +08:00 |
|
huang
|
8ea626ec40
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 18:05:52 +08:00 |
|
huang
|
ce740170ca
|
Merge branch 'hjq_new_course' into szzh
Conflicts:
public/stylesheets/public.css
处理冲突
|
2015-12-25 18:05:36 +08:00 |