 huang
|
961a264e05
|
创建时间统一date
|
9 years ago |
|
huang
|
65e80b1978
|
用户图像样式
|
9 years ago |
|
huang
|
7c9e20c9bf
|
登录注册样式
|
9 years ago |
|
huang
|
d28a46c48a
|
北斗资源库板块
|
9 years ago |
|
huang
|
80cd5089a4
|
Merge branch 'develop' into hjq_beidou
Conflicts:
db/schema.rb
|
9 years ago |
|
huang
|
2b9ddf3594
|
组织新版
|
9 years ago |
|
huang
|
b80bc98fcb
|
组织首页
|
9 years ago |
|
huang
|
b8463fcca5
|
北斗
|
9 years ago |
 cxt
|
33c9331c7b
|
课程设置为私有/公开 课程头部未刷新
|
9 years ago |
|
huang
|
4b6b5504ca
|
北斗框架（未完）
|
9 years ago |
|
huang
|
326730f6b1
|
北斗框架
|
9 years ago |
|
huang
|
1bf494f661
|
课程推荐资源统计数
|
9 years ago |
|
huang
|
ba25f41bcb
|
添加教师统计数、学生统计数
|
9 years ago |
 alan
|
6862480632
|
修改当用户没有项目时，报错
|
9 years ago |
|
alan
|
4587e728d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
alan
|
05d66f41f9
|
fix bug when user don't have courses or projects
|
9 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
|
9 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
|
9 years ago |
|
huang
|
9ce39d2f4a
|
Issue模块动态优化
|
9 years ago |
|
huang
|
9549d695f6
|
讨论区局部优化
|
9 years ago |
|
huang
|
ff2340baf9
|
课程统计信息优化
|
9 years ago |
|
huang
|
cb4b26762d
|
课程base优化
|
9 years ago |
 ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题
|
9 years ago |
|
huang
|
1330f02db8
|
项目创建的动态以多态形式存入forge_activities
|
9 years ago |
|
alan
|
0d049bbe1f
|
refactor new_base_user
|
9 years ago |
|
alan
|
13e265b7d2
|
优化 layouts/_user_projects 和 layouts/_user_courses页面
|
9 years ago |
|
huang
|
70d594659e
|
课程英雄榜代码封装
|
9 years ago |
|
huang
|
e06695b56b
|
课程活跃度代码封装
|
9 years ago |
|
ouyangxuhua
|
5c22b23f3a
|
Merge branch 'develop' into ouyangxuhua
|
9 years ago |
|
ouyangxuhua
|
1eafad6468
|
鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息
|
9 years ago |
|
cxt
|
b8b34f7861
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
1489c8d924
|
课程简介没有内容就不要显示
|
9 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
9 years ago |
|
cxt
|
602864bd71
|
个人主页课程列表: 1、增加学期信息 2、排序不对
|
9 years ago |
|
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
9 years ago |
|
ouyangxuhua
|
b716e593b5
|
组织下的链接问题
|
9 years ago |
|
ouyangxuhua
|
098844a910
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
app/views/organizations/_org_course_homework.html.erb
app/views/organizations/_org_course_news.html.erb
app/views/organizations/_org_project_issue.html.erb
app/views/organizations/_project_message.html.erb
app/views/organizations/_show_org_document.html.erb
app/views/users/_user_message_course.html.erb
|
9 years ago |
|
huang
|
5681d329d6
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/news_controller.rb
app/views/users/_user_message_userfeedaback.html.erb
|
9 years ago |
|
ouyangxuhua
|
15dfaf67b2
|
测试版环境，登陆注册改成https://test.forge.
|
9 years ago |
|
ouyangxuhua
|
c0edd91c3d
|
登陆注册链接改为www.
|
9 years ago |
|
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示
|
9 years ago |
|
ouyangxuhua
|
f496761325
|
将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名
|
9 years ago |
|
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
1d93c6c56b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
huang
|
97a7694778
|
访问统计数--views
|
9 years ago |
 Tim
|
53c281103c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
Tim
|
de3a4718ab
|
个人，课程，项目，组织访问量添加
|
9 years ago |
|
cxt
|
dcd13b9d6b
|
点击个人主页的课程和项目在新的tab页中打开
|
9 years ago |
|
huang
|
c947121e2b
|
消息不显示问题（未完）
|
9 years ago |
|
ouyangxuhua
|
f917e96a12
|
组织栏目中的链接的url更新
|
9 years ago |
