 cxt
|
e97690e2f2
|
“导入作业”改为“从题库选用”
|
2016-03-15 16:47:57 +08:00 |
|
cxt
|
90d664bbca
|
学生提交作品时描述框可以直接插入图片，作品列表也直接显示图片。
|
2016-03-15 16:36:10 +08:00 |
 huang
|
a10475fa65
|
公共资源删除、新建代码优化
|
2016-03-15 16:28:35 +08:00 |
 linchun
|
7d5a5f1de2
|
完成项目资源列表中的排序（资源大小，上传时间，下载次数）
|
2016-03-15 16:14:53 +08:00 |
|
linchun
|
3fcf192430
|
完成了课程资源列表的排序（上传时间，资源大小，下载次数）
|
2016-03-15 15:59:49 +08:00 |
|
huang
|
22ce591c36
|
资源库添加搜索过滤
|
2016-03-15 15:42:20 +08:00 |
|
linchun
|
d3ed89d87e
|
sort
|
2016-03-15 15:23:43 +08:00 |
 ouyangxuhua
|
70f4bb1c14
|
Merge branch 'develop' into ouyangxuhua
|
2016-03-15 14:22:38 +08:00 |
|
ouyangxuhua
|
fe0d31d9c4
|
1.用户信息中的额用户链接改成正确连接；组织资源文件名过长时省略显示
|
2016-03-15 14:17:06 +08:00 |
|
ouyangxuhua
|
b716e593b5
|
组织下的链接问题
|
2016-03-15 13:49:44 +08:00 |
|
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
|
2016-03-15 13:40:33 +08:00 |
|
ouyangxuhua
|
2a46d60433
|
组织下的链接的host_name均使用Setting.host_name
|
2016-03-15 11:19:03 +08:00 |
|
huang
|
5681d329d6
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/controllers/news_controller.rb
app/views/users/_user_message_userfeedaback.html.erb
|
2016-03-15 11:12:24 +08:00 |
|
huang
|
bf4116906f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/users_controller.rb
public/stylesheets/public.css
|
2016-03-15 11:09:11 +08:00 |
|
cxt
|
5476016b79
|
调整题库高度与资源库一致
|
2016-03-15 09:47:58 +08:00 |
|
linchun
|
4da8a3828f
|
用户最新列表单位完成，修改了点击最后两页报错的问题
|
2016-03-15 09:47:27 +08:00 |
|
linchun
|
df4ad9f597
|
完成管理员界面最近登录列表单位信息
|
2016-03-15 09:31:35 +08:00 |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
2016-03-15 09:26:26 +08:00 |
|
ouyangxuhua
|
402b0e9c24
|
域名都使用Setting.host_name获取主机名
|
2016-03-14 23:15:08 +08:00 |
|
huang
|
3bfaddc80f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-14 18:31:09 +08:00 |
|
ouyangxuhua
|
15dfaf67b2
|
测试版环境，登陆注册改成https://test.forge.
|
2016-03-14 18:29:50 +08:00 |
|
huang
|
a7990a4c3c
|
Merge branch 'yuanke' into develop
|
2016-03-14 18:25:26 +08:00 |
|
ouyangxuhua
|
c0edd91c3d
|
登陆注册链接改为www.
|
2016-03-14 18:20:19 +08:00 |
 yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
2016-03-14 18:19:23 +08:00 |
|
huang
|
a1cae3f592
|
admin教师单位获取
|
2016-03-14 17:50:07 +08:00 |
|
ouyangxuhua
|
46b50ab065
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-14 17:46:47 +08:00 |
|
linchun
|
a1bef60bb5
|
Merge branch 'linchun' of https://git.trustie.net/jacknudt/trustieforge into linchun
|
2016-03-14 17:41:14 +08:00 |
|
linchun
|
96f65f338c
|
用户列表添加单位
|
2016-03-14 17:40:49 +08:00 |
|
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
2016-03-14 17:31:53 +08:00 |
|
ouyangxuhua
|
2899f29b5f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-14 17:29:06 +08:00 |
|
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
2016-03-14 17:16:11 +08:00 |
|
cxt
|
d2a8acf87b
|
个人主页--首页显示不全，右下角也应该显示展开按钮
|
2016-03-14 17:11:23 +08:00 |
|
huang
|
7c624cd571
|
公共资源只包括公开资源
|
2016-03-14 16:35:18 +08:00 |
|
cxt
|
c770fd157c
|
题库：题目描述变窄，缺省文字：【尹刚提供】
|
2016-03-14 16:33:16 +08:00 |
 luoquan
|
006731ea61
|
修改以下问题：
KE问题：编辑时行间距挺好，发布后，在项目讨论区中的显示行间距稍微有点挤。
KE问题：缺省的文字颜色：在编辑时是黑色，但发布后就是灰色。应该发布后也是黑色。
|
2016-03-14 15:51:50 +08:00 |
|
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示
|
2016-03-14 15:39:45 +08:00 |
|
luoquan
|
270a290df9
|
修改视频不能播放问题。
|
2016-03-14 15:18:56 +08:00 |
|
cxt
|
3d1f7cc0a8
|
提交作品：作品标题设缺省值：作业名称+“的作品提交”。学生不改就使用缺省值
|
2016-03-14 15:02:37 +08:00 |
|
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
2016-03-14 14:43:30 +08:00 |
|
cxt
|
1aa5450e4a
|
题库支持按发布者、来源、类型的排序
|
2016-03-14 14:39:58 +08:00 |
 alan
|
3eaa4b08a3
|
解决删除用户报500错误
|
2016-03-14 11:06:29 +08:00 |
|
ouyangxuhua
|
f496761325
|
将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名
|
2016-03-14 11:00:55 +08:00 |
|
alan
|
2f5ce553e2
|
refactor user find
|
2016-03-14 10:46:02 +08:00 |
|
alan
|
0998ca3974
|
Merge branch 'develop' into FX-alan-search-404
|
2016-03-14 10:25:39 +08:00 |
|
alan
|
ce6d63ccaf
|
重构user.find
|
2016-03-14 10:24:50 +08:00 |
|
cxt
|
f174101297
|
数据迁移
|
2016-03-11 20:28:43 +08:00 |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
2016-03-11 19:43:36 +08:00 |
|
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
2016-03-11 19:34:33 +08:00 |
|
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2016-03-11 19:31:22 +08:00 |
|
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
2016-03-11 19:31:06 +08:00 |