 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 |
|
ouyangxuhua
|
2a46d60433
|
组织下的链接的host_name均使用Setting.host_name
|
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 |
|
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
9 years ago |
 cxt
|
5476016b79
|
调整题库高度与资源库一致
|
9 years ago |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
9 years ago |
|
ouyangxuhua
|
402b0e9c24
|
域名都使用Setting.host_name获取主机名
|
9 years ago |
|
huang
|
3bfaddc80f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
ouyangxuhua
|
15dfaf67b2
|
测试版环境，登陆注册改成https://test.forge.
|
9 years ago |
|
huang
|
a7990a4c3c
|
Merge branch 'yuanke' into develop
|
9 years ago |
|
ouyangxuhua
|
c0edd91c3d
|
登陆注册链接改为www.
|
9 years ago |
 yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
9 years ago |
|
ouyangxuhua
|
46b50ab065
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
9 years ago |
|
ouyangxuhua
|
2899f29b5f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
9 years ago |
|
cxt
|
d2a8acf87b
|
个人主页--首页显示不全，右下角也应该显示展开按钮
|
9 years ago |
|
huang
|
7c624cd571
|
公共资源只包括公开资源
|
9 years ago |
|
cxt
|
c770fd157c
|
题库：题目描述变窄，缺省文字：【尹刚提供】
|
9 years ago |
 luoquan
|
006731ea61
|
修改以下问题：
KE问题：编辑时行间距挺好，发布后，在项目讨论区中的显示行间距稍微有点挤。
KE问题：缺省的文字颜色：在编辑时是黑色，但发布后就是灰色。应该发布后也是黑色。
|
9 years ago |
|
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示
|
9 years ago |
|
luoquan
|
270a290df9
|
修改视频不能播放问题。
|
9 years ago |
|
cxt
|
3d1f7cc0a8
|
提交作品：作品标题设缺省值：作业名称+“的作品提交”。学生不改就使用缺省值
|
9 years ago |
|
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
9 years ago |
|
cxt
|
1aa5450e4a
|
题库支持按发布者、来源、类型的排序
|
9 years ago |
 alan
|
3eaa4b08a3
|
解决删除用户报500错误
|
9 years ago |
|
ouyangxuhua
|
f496761325
|
将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名
|
9 years ago |
|
alan
|
2f5ce553e2
|
refactor user find
|
9 years ago |
|
alan
|
0998ca3974
|
Merge branch 'develop' into FX-alan-search-404
|
9 years ago |
|
alan
|
ce6d63ccaf
|
重构user.find
|
9 years ago |
|
cxt
|
f174101297
|
数据迁移
|
9 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
9 years ago |
|
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
9 years ago |
|
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
cxt
|
a845da5c17
|
点赞有延迟
|
9 years ago |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
9 years ago |
 linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
9 years ago |
|
luoquan
|
e0922e9b19
|
调整视频播放默认图大小
|
9 years ago |
|
cxt
|
1d93c6c56b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
9 years ago |
|
cxt
|
e02bde6f65
|
作品列表支持按学生姓名和学号排序
|
9 years ago |
|
huang
|
97a7694778
|
访问统计数--views
|
9 years ago |
 Tim
|
45f1cfa477
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
9 years ago |
|
Tim
|
051c9dfd0c
|
Merge branch 'cxt_course' into develop
|
9 years ago |
|
huang
|
8079254089
|
首页增加访问统计
|
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 |
|
huang
|
c18634be86
|
课程通知。新闻代码优化
|
9 years ago |
|
luoquan
|
4fa25f68b6
|
Merge branch 'luoquan' into yuanke
|
9 years ago |
|
luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
9 years ago |
