cxt
|
668a724064
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop_new
|
9 years ago |
cxt
|
69373468ae
|
作品详情打不开
|
9 years ago |
alan
|
9452254b62
|
去掉缓存机制
|
9 years ago |
alan
|
e4fc9f39e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
yuanke
|
be1351a4d8
|
Merge branch 'yuanke' into develop
|
9 years ago |
yuanke
|
ef5d8abf38
|
修改编程作业提示服务器出错的BUG
|
9 years ago |
alan
|
03d855f5d5
|
修改资源区分页问题
|
9 years ago |
ouyangxuhua
|
7f0959c972
|
题库发送输入框中文能正常输入并调整样式;调整发送功能的其他样式
|
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 |
ouyangxuhua
|
a69997f6c7
|
Merge branch 'develop' into ouyangxuhua
|
9 years ago |
alan
|
90fd52970b
|
fix bugger on 资源区
|
9 years ago |
ouyangxuhua
|
598f69abb0
|
组织显示模式暂时隐藏
|
9 years ago |
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
9 years ago |
ouyangxuhua
|
1a1d5b4c49
|
解决:发送功能在中文输入的情况下,会出现输入框内容增多的问题
|
10 years ago |
cxt
|
8e7d25a483
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
cxt
|
f46985c8bc
|
作品点赞报500
|
10 years ago |
huang
|
64f13a04cc
|
动态500问题
|
10 years ago |
cxt
|
33c9331c7b
|
课程设置为私有/公开 课程头部未刷新
|
10 years ago |
huang
|
9fc227d619
|
资源库问题
|
10 years ago |
ouyangxuhua
|
67ff9fb6e2
|
组织显示模式功能
|
10 years ago |
ouyangxuhua
|
f4b4bf40de
|
增加显示组织显示模式字段,并且在新建组织和配置组织中能够选择
|
10 years ago |
yuanke
|
2ceef7d3e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge 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 |
huang
|
1bf494f661
|
课程推荐资源统计数
|
10 years ago |
cxt
|
0d5bad1ddd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
cxt
|
35faa12d4d
|
组织编辑文章无法提交
|
10 years ago |
ouyangxuhua
|
f0d6bb7fae
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
ouyangxuhua
|
26b81fb8b3
|
组织文章列表回复问题解决
|
10 years ago |
huang
|
777e585d4d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
huang
|
ba25f41bcb
|
添加教师统计数、学生统计数
|
10 years ago |
ouyangxuhua
|
00d2542964
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
ouyangxuhua
|
0f4d2e40fb
|
添加成员查询的语句,每个条件都要加上escape'/';组织栏目新建文章margin调整
|
10 years ago |
alan
|
e764075bd6
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
alan
|
16831e19d9
|
merge 晓婷的课程留言
|
10 years ago |
ouyangxuhua
|
2261081dc2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
alan
|
6862480632
|
修改当用户没有项目时,报错
|
10 years ago |
ouyangxuhua
|
cca2527401
|
组织栏目新建文章样式调整
|
10 years ago |
alan
|
4587e728d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
alan
|
05d66f41f9
|
fix bug when user don't have courses or projects
|
10 years ago |
yuanke
|
4c47dae88b
|
Merge branch 'develop' into yuanke
|
10 years ago |
huang
|
dea1c13a64
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
db/migrate/20160324074942_add_index_to_forge_activities.rb
|
10 years ago |
huang
|
cca570e75c
|
课程相关优化
|
10 years ago |
alan
|
3b48b3add7
|
refactor cache
|
10 years ago |
alan
|
46951f7af9
|
Merge branch 'develop' into alan_develop
Conflicts:
app/views/student_work/_student_work_list.html.erb
app/views/users/_user_activities.html.erb
app/views/users/_user_message_course.html.erb
|
10 years ago |
alan
|
4f5e083707
|
优化个人主页,缓存设置
|
10 years ago |