 huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
68edc792e9
|
Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou
Conflicts:
app/controllers/organizations_controller.rb
|
9 years ago |
|
huang
|
2b9ddf3594
|
组织新版
|
9 years ago |
 ouyangxuhua
|
2275b367f4
|
在organization控制器的show方法添加layout
|
9 years ago |
|
ouyangxuhua
|
56f8d4854b
|
恢复代码
|
9 years ago |
 alan
|
e9069f0225
|
fix merge bug
|
9 years ago |
|
alan
|
eb1c6ccf85
|
Merge branch 'alan_develop' into develop
Conflicts:
app/views/users/_resource_share_for_orgs.html.erb
app/views/users/_resource_share_for_project_popup.html.erb
app/views/users/_resource_share_popup.html.erb
app/views/users/search_user_course.js.erb
app/views/users/search_user_org.js.erb
app/views/users/search_user_project.js.erb
|
9 years ago |
|
huang
|
b80bc98fcb
|
组织首页
|
9 years ago |
 cxt
|
d1cb44cff7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
1daf620ed1
|
新建作品点取消时跳到我的作业页面
|
9 years ago |
|
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
9 years ago |
|
alan
|
dfe9cb0c68
|
Merge branch 'develop' into alan_develop
|
9 years ago |
|
alan
|
90fd52970b
|
fix bugger on 资源区
|
9 years ago |
|
cxt
|
0b0f484a5b
|
更新吴文植的分数
|
9 years ago |
|
ouyangxuhua
|
598f69abb0
|
组织显示模式暂时隐藏
|
9 years ago |
|
cxt
|
b9f1ff3cd2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
ed0eb4aff3
|
学生作品详情无法打开
|
9 years ago |
 yuanke
|
0217dc0054
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
213cf48c09
|
编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管
|
9 years ago |
|
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
9 years ago |
|
ouyangxuhua
|
1a1d5b4c49
|
解决：发送功能在中文输入的情况下，会出现输入框内容增多的问题
|
9 years ago |
|
cxt
|
8e7d25a483
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
f46985c8bc
|
作品点赞报500
|
9 years ago |
|
huang
|
64f13a04cc
|
动态500问题
|
9 years ago |
|
huang
|
b8463fcca5
|
北斗
|
9 years ago |
|
cxt
|
33c9331c7b
|
课程设置为私有/公开 课程头部未刷新
|
9 years ago |
|
huang
|
74a4e80795
|
Merge branch 'ouyangxuhua' into hjq_beidou
|
9 years ago |
|
huang
|
9fc227d619
|
资源库问题
|
9 years ago |
|
huang
|
4b6b5504ca
|
北斗框架（未完）
|
9 years ago |
|
ouyangxuhua
|
67ff9fb6e2
|
组织显示模式功能
|
9 years ago |
|
ouyangxuhua
|
f4b4bf40de
|
增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择
|
9 years ago |
|
huang
|
326730f6b1
|
北斗框架
|
9 years ago |
|
yuanke
|
5ee36148a4
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
668de3ce4c
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
f217c9097a
|
全部正确需要提示是否提交
|
9 years ago |
|
yuanke
|
879a34a1a5
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
1b4f525ad0
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
88ba2bf556
|
编译错误处理
|
9 years ago |
|
yuanke
|
5f783b3eb7
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
77ad99e838
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
yuanke
|
0011b87d5d
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
5116d75eb7
|
编程作业空格用□表示
|
9 years ago |
|
yuanke
|
879a941b01
|
Merge branch 'develop' into yuanke
|
9 years ago |
|
yuanke
|
e62ee2eade
|
修改评测问题
|
9 years ago |
|
yuanke
|
2ceef7d3e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
yuanke
|
f6a22d74da
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
ef49715b08
|
编程测试加个results为空判断
|
10 years ago |
|
yuanke
|
a58ba8080c
|
编程作业加个日志
|
10 years ago |
|
huang
|
c7c96e0c6a
|
公共资源附件名编辑问题
|
10 years ago |
|
huang
|
fc006d64bb
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
