cxt
|
1448c4f90e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
cxt
|
6b8da96205
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
cxt
|
a74cba5190
|
编程作业的迟交扣分有问题
|
10 years ago |
cxt
|
335ea381b4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
cxt
|
76b95fbf93
|
课程和项目的课程简介默认可显示20行
|
10 years ago |
Tim
|
d71e8376ae
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
Tim
|
077368f597
|
匿评增加系统评分显示,对应样式调整
|
10 years ago |
cxt
|
e948c94300
|
在线测验的填空题未断网时报网络异常
|
10 years ago |
cxt
|
9348cc9c24
|
编程作业匿评添加系统评分
|
10 years ago |
guange
|
aa951cd7b9
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
guange
|
941d6d09d5
|
查看代码在firefox中显示不了的问题
|
10 years ago |
guange
|
887d2f9f00
|
添加micros和nubot的链接
|
10 years ago |
cxt
|
53ccd0debe
|
Merge branch 'develop' into cxt_course
|
10 years ago |
ouyangxuhua
|
d1c7aad742
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
ouyangxuhua
|
40bf109223
|
给资源栏目增加board
|
10 years ago |
huang
|
4f331d95c7
|
课程讨论区、项目讨论编辑的时候显示附件信息不一致问题
|
10 years ago |
huang
|
aa87ef6f1b
|
解决Chrome浏览器等比缩放后样式错乱问题
|
10 years ago |
huang
|
d0d736d55c
|
Merge branch 'szzh' into develop
|
10 years ago |
huang
|
6b4b87ed09
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/organizations/_org_left_subfield_list.html.erb
处理冲突
|
10 years ago |
huang
|
07827d0520
|
Merge branch 'develop' into szzh
|
10 years ago |
huang
|
743950d264
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
huang
|
0763963ca4
|
格式
|
10 years ago |
ouyangxuhua
|
2cd48a1ca2
|
暂时隐藏帖子发送功能
|
10 years ago |
ouyangxuhua
|
f9de793124
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
ouyangxuhua
|
0cf2279cf5
|
解决一下bug:
1.组织:引用资源至某栏目,若该组织只有一个栏目,且该资源已成功引用至该组织栏目,如图就不要再显示为“选入组织其他栏目”了
2.组织:只有管理员才能关联课程/项目
|
10 years ago |
huang
|
5618fe067a
|
项目分页,点击加载
|
10 years ago |
cxt
|
c3ddbcfddf
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
cxt
|
583fe55ba2
|
Merge branch 'szzh' into develop
|
10 years ago |
cxt
|
5d2c760a8e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
cxt
|
3553e34e2e
|
Merge branch 'cxt_course' into szzh
|
10 years ago |
cxt
|
605ec52f8a
|
测验答题失败时提示网络异常
|
10 years ago |
ouyangxuhua
|
58edc150e6
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
ouyangxuhua
|
2e41e9890a
|
将riserved改成reserved
|
10 years ago |
huang
|
d6e765cf4a
|
修正讨论区删除跳转
|
10 years ago |
huang
|
41cd038758
|
讨论区帖子添加锁定
|
10 years ago |
cxt
|
179058f1aa
|
学生总成绩不能为负分
|
10 years ago |
huang
|
b6cf709696
|
解决讨论区冲突
|
10 years ago |
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
解决冲突
|
10 years ago |
cxt
|
e6ebcb7ac6
|
作品列表页面的截止时间改为提交截止时间/匿评截止时间
|
10 years ago |
huang
|
5060ec26bb
|
项目讨论区
|
10 years ago |
cxt
|
000f40ad42
|
作业动态的截止时间根据作业当前所处状态来确定是提交截止时间还是匿评截止时间
|
10 years ago |
cxt
|
6bdd6d3e03
|
课程添加设置菜单,设置页面的信息更改
|
10 years ago |
ouyangxuhua
|
0d98dba25c
|
解决项目新建帖子中,点击取消按钮没有反应的问题
|
10 years ago |
ouyangxuhua
|
5334a3d40f
|
链接样式还原
|
10 years ago |
ouyangxuhua
|
d77625e4e9
|
Merge branch 'develop' into dev_hjq
|
10 years ago |
ouyangxuhua
|
33ea55ecca
|
项目/课程帖子发送弹窗样式修改
|
10 years ago |
lizanle
|
174f7c1972
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
app/views/issues/_list.html.erb
|
10 years ago |
lizanle
|
5ce9a5109d
|
issue存在重复
|
10 years ago |
huang
|
900d7d62cb
|
邮件按天发送添加提示
|
10 years ago |
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
|
10 years ago |