 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 |
 huang
|
8f0038c3ff
|
tag
|
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 |
|
yuanke
|
674b63d106
|
Merge branch 'develop' into yuanke
Conflicts:
app/views/student_work/_programing_work_show.html.erb
|
10 years ago |
|
huang
|
e02ad85bbb
|
项目动态关联优化（主要优化查询次数）
|
10 years ago |
|
huang
|
9ce39d2f4a
|
Issue模块动态优化
|
10 years ago |
|
ouyangxuhua
|
9f8ad41533
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
 cxt
|
46a05d1000
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
b581a13736
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
yuanke
|
dea947e9ce
|
Merge branch 'develop' into yuanke
Conflicts:
db/schema.rb
public/javascripts/application.js
public/javascripts/homework.js
public/stylesheets/new_user.css
|
10 years ago |
|
yuanke
|
c6361406b5
|
代码评测超时优化
|
10 years ago |
|
huang
|
9549d695f6
|
讨论区局部优化
|
10 years ago |
|
alan
|
aeb694a68e
|
修改《删除blog_comment时删除user_activities内容》
|
10 years ago |
|
ouyangxuhua
|
7b24b053a5
|
Merge branch 'develop' into ouyang
|
10 years ago |
|
ouyangxuhua
|
5cc31fb511
|
组织资源栏目排序，带过滤条件，如tag类型、搜索条件等
|
10 years ago |
|
huang
|
ff2340baf9
|
课程统计信息优化
|
10 years ago |
|
alan
|
04b4823ac2
|
user_activities 加cache
|
10 years ago |
|
huang
|
cb4b26762d
|
课程base优化
|
10 years ago |
|
alan
|
357c60d42e
|
Merge branch 'hjq_new_course' into alan_develop
|
10 years ago |
|
alan
|
7108e6d763
|
减少数据库查询字段
|
10 years ago |
|
ouyangxuhua
|
2d4f5284df
|
删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题
|
10 years ago |
|
huang
|
9cbe719c5e
|
项目动态表添加索引
|
10 years ago |
|
huang
|
88185b1f34
|
点击作品消息，作品展开
|
10 years ago |
|
huang
|
77419dc2d4
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
alan
|
11a5e0a963
|
Merge branch 'develop' into alan_develop
|
10 years ago |
|
huang
|
a9ef2c28e2
|
项目创建类型迁移
|
10 years ago |
|
alan
|
a0e11a787f
|
修改个人主页不能展开更多
|
10 years ago |
|
huang
|
1330f02db8
|
项目创建的动态以多态形式存入forge_activities
|
10 years ago |
|
ouyangxuhua
|
589f939bbd
|
消息类型“学生再次提交作业”中的链接，应该打开学生作品
|
10 years ago |
|
huang
|
d6f81c8978
|
课程讨论区优化
|
10 years ago |
|
ouyangxuhua
|
3fc988757c
|
组织、项目、课程等在配置中添加成员时，对特殊字符'_'、‘/’添加转义，使能够搜索
|
10 years ago |
|
alan
|
0d049bbe1f
|
refactor new_base_user
|
10 years ago |
|
huang
|
f1ffd3852f
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
huang
|
185ad829cd
|
项目访问速度优化
|
10 years ago |
|
alan
|
13e265b7d2
|
优化 layouts/_user_projects 和 layouts/_user_courses页面
|
10 years ago |
|
ouyangxuhua
|
1579a86f9f
|
老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示
|
10 years ago |
|
cxt
|
fe35bb3b44
|
学生打开作品列表报500
|
10 years ago |
|
ouyangxuhua
|
6b3e9ba4b3
|
新建组织时，点击私有或者公开选项，允许游客下载选项及时响应
|
10 years ago |
|
alan
|
a165657915
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
alan
|
49026f0438
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
alan
|
9273e37a5b
|
优化SQL查询：1，members与users表关联查询； 2，blogs表单查询
|
10 years ago |
|
cxt
|
aa1cbcdf87
|
课程留言动态加入个人动态
|
10 years ago |
|
cxt
|
f90b25b230
|
作业附件的用户名省略号太早
|
10 years ago |
|
huang
|
12efbcb9ae
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
7967066b05
|
附件添加动态发送方式改变
|
10 years ago |
|
ouyangxuhua
|
fcb189d874
|
编辑组织栏目的顺序时，不需要弹窗
|
10 years ago |
|
ouyangxuhua
|
675b1ad403
|
1.组织配置中，输入组织名字、子栏目域名目录后，自动变成小写字母；2.将所有子域名及域名目录改成小写；3.组织配置中，修改子栏目时，如果没有点确定，输入框的内容保持不变。
|
10 years ago |
|
huang
|
478311128d
|
优化project_controller show方法
|
10 years ago |
|
huang
|
341308658d
|
优化项目消息更新代码
|
10 years ago |
guange
|
fbe1b2dac2
|
Merge branch 'guange_dev' into weixin_guange
# Conflicts:
# Gemfile
# db/schema.rb
|
10 years ago |
|
huang
|
e20fe85ddf
|
消息去掉tip
|
10 years ago |
|
huang
|
70d594659e
|
课程英雄榜代码封装
|
10 years ago |
|
huang
|
e06695b56b
|
课程活跃度代码封装
|
10 years ago |
|
huang
|
e77a891bc6
|
消息查询语句优化，添加索引
|
10 years ago |
|
guange
|
6ae4cd0767
|
merge
|
10 years ago |
|
yuanke
|
a10830c90f
|
Merge branch 'develop' into yuanke
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
ouyangxuhua
|
4fa1288411
|
添加组织栏目后，栏目子域名输入框设置为空
|
10 years ago |
 linchun
|
6284b8d4f9
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
guange
|
59923dfb03
|
merge
|
10 years ago |
|
ouyangxuhua
|
84703a3e01
|
组织配置中的添加成员，链接使用https://www形式
|
10 years ago |
|
cxt
|
74e77bf347
|
题库的来源排序不可用
题库的分布时间排序
|
10 years ago |
|
cxt
|
fdcd44e240
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
d967a31ec9
|
课程报500
|
10 years ago |
|
alan
|
7d4e0c5d8a
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
alan
|
20cdec0cab
|
Merge branch 'alan_develop' into develop
|
10 years ago |
|
alan
|
66d2558f87
|
修复《issue具体页面样式》
|
10 years ago |
|
huang
|
2793a9a874
|
0
|
10 years ago |
|
ouyangxuhua
|
a1fbe8b886
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
0413eb1c02
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
alan
|
2b07671d95
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
8b09be83e0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
fc6210eada
|
资源导入，搜索条件中导入400问题
|
10 years ago |
|
cxt
|
9917e802cb
|
课程推荐的资源统计
|
10 years ago |
|
cxt
|
e167a28d49
|
课程推荐的作业统计
|
10 years ago |
|
ouyangxuhua
|
c64910d343
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
a482b76207
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
dc4a7ee2e6
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
e34f2e45db
|
管理员界面的课程列表和项目列表分页
|
10 years ago |
|
ouyangxuhua
|
5c22b23f3a
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
cxt
|
b1f3395bd1
|
修改作品描述框和名称框的提示文字
|
10 years ago |
|
ouyangxuhua
|
b5964fba0b
|
组织超链接问题
|
10 years ago |
|
huang
|
bff20ee072
|
英雄榜数据显示问题
|
10 years ago |
|
huang
|
51bd745b8d
|
课程讨论区限制改成20000
|
10 years ago |
|
linchun
|
d3635067b7
|
Merge remote-tracking branch 'remotes/origin/develop' into linchun
|
10 years ago |
|
linchun
|
66a7827eb2
|
组织列表增加分页功能，学校列表调整分页
|
10 years ago |
|
cxt
|
24318e3d6b
|
题库的刷新
|
10 years ago |
|
linchun
|
f8a88767c0
|
管理员用户列表增加单位信息
|
10 years ago |
|
huang
|
8a8c9bf7c3
|
注释修改
|
10 years ago |
|
huang
|
2fe1100da6
|
去掉课程使者帖子中时间
|
10 years ago |
|
huang
|
888c024e9e
|
资源库ajax局部刷新
|
10 years ago |
|
huang
|
4876e6669a
|
课程附件局部刷新
|
10 years ago |
|
cxt
|
119b12349b
|
作品名称的缺省值为 作业名称+的作品提交(可修改) 若学生不修改则保存为 作业名称+的作品提交
|
10 years ago |
|
ouyangxuhua
|
1eafad6468
|
鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息
|
10 years ago |
|
huang
|
4766abab7f
|
下载行为添加ID判断
|
10 years ago |
|
huang
|
b262e1b432
|
完成下载行为记录
|
10 years ago |
|
alan
|
6f5a4d429d
|
修改《issue详情页面样式乱了》
|
10 years ago |
|
cxt
|
2466184d8a
|
编辑作业的时候，还要选择作业发布的课程不合理，影响体验
编辑作业时layout根据来源而不同
|
10 years ago |
|
huang
|
79767f4bae
|
用户行为记录
|
10 years ago |
|
ouyangxuhua
|
34d1aef256
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
282a720916
|
私有组织下的资源栏目，没有发送文件功能
|
10 years ago |
|
huang
|
4999b47b44
|
项目去掉ID
|
10 years ago |
|
cxt
|
c73637a4ca
|
作业列表按作业发布时间排序
|
10 years ago |
|
huang
|
1b0bcd0c05
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
cefa6efc1b
|
项目动态中加入附件
|
10 years ago |
|
cxt
|
b8b34f7861
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
368c70b14d
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
1489c8d924
|
课程简介没有内容就不要显示
|
10 years ago |
|
ouyangxuhua
|
093c777b23
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/views/users/_user_message_course.html.erb
|
10 years ago |
|
cxt
|
602864bd71
|
个人主页课程列表: 1、增加学期信息 2、排序不对
|
10 years ago |
|
cxt
|
10da3e1e53
|
题库样式调整
|
10 years ago |
|
huang
|
7e0aa44b68
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/users/_user_message_userfeedaback.html.erb
|
10 years ago |
|
huang
|
28cb1755d8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/files/_org_subfield_list.html.erb
db/schema.rb
|
10 years ago |
|
cxt
|
6b8ae56ce4
|
Merge branch 'alan_develop' into develop
|
10 years ago |
|
huang
|
03597b85ff
|
解决项目被淹没问题
|
10 years ago |
|
cxt
|
0f80f0e377
|
作品列表：已禁用了匿评的作业就不要显示“匿评截止时间”了
|
10 years ago |
|
cxt
|
d72aa3a93c
|
Merge branch 'develop' into cxt_course
Conflicts:
app/controllers/homework_common_controller.rb
app/views/student_work/show.js.erb
public/javascripts/application.js
public/stylesheets/base.css
public/stylesheets/public_new.css
|
10 years ago |
|
cxt
|
a1f393c117
|
批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样
|
10 years ago |
|
cxt
|
2eefdcd0ee
|
批改程序作业时，如果一个同学A的程序打开后没有收起，则后面打开的学生的程序就和A的程序一样
|
10 years ago |
|
huang
|
42d89c7ed0
|
课程导语发送这改成课堂使者
|
10 years ago |
|
alan
|
8e41b19563
|
消息列表取消tip
|
10 years ago |
|
linchun
|
52af5e4303
|
修复了管理员界面多个列表的题目问题
|
10 years ago |
|
cxt
|
a8780be9b4
|
提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子
|
10 years ago |
|
huang
|
84470af2ff
|
删除的课程和项目不在发送中显示
|
10 years ago |
|
alan
|
a4e2fd741e
|
删除issue，返回页面不变
|
10 years ago |
|
huang
|
ee40255d7e
|
资源库bytes改成b
|
10 years ago |
|
huang
|
0d1fc409d1
|
版本库提示同一高度
|
10 years ago |
|
huang
|
ab3fc0fb2c
|
成员提供真实姓名
|
10 years ago |
|
huang
|
c8eb2d9c95
|
项目、组织添加资源历史版本下载
|
10 years ago |
|
huang
|
b3faef601b
|
修复资源库样式问题
|
10 years ago |
|
huang
|
7ff946e488
|
课程资源库提供历史版本下载
|
10 years ago |
|
ouyangxuhua
|
805784a858
|
组织内的链接加上Setting.protocol
|
10 years ago |
|
huang
|
0a881f14e8
|
导入添加自动搜索
|
10 years ago |
|
alan
|
4d82f0c959
|
在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》
|
10 years ago |
|
linchun
|
34c9f54510
|
完成了管理员界面学校列表
|
10 years ago |
|
alan
|
3b63071dee
|
修复《issue的展开和收起在属性表格的上面》
|
10 years ago |
|
ouyangxuhua
|
baf547417e
|
组织下的链接用Setting.protocol表示协议
|
10 years ago |
|
huang
|
064dc81ed6
|
解决公共资源删除资源后统计数字不减少的问题
（增加删除回调）
|
10 years ago |
|
ouyangxuhua
|
ea6de1407e
|
Merge branch 'develop' into ouyangxuhua
Conflicts:
app/helpers/application_helper.rb
|
10 years ago |
|
ouyangxuhua
|
dcadadae03
|
退出和用户的链接使用https:// +Setting.host_name
|
10 years ago |
|
alan
|
050a266985
|
Merge branch 'FX-alan-message-access-slow' into alan_develop
|
10 years ago |
|
alan
|
0ac12f3400
|
Merge branch 'FX-alan-admin-deleteuser-500' into alan_develop
|
10 years ago |
|
alan
|
5343759f2f
|
Merge branch 'FX-alan-search-404' into alan_develop
|
10 years ago |
|
ouyangxuhua
|
da1b27cd38
|
Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang
|
10 years ago |
|
ouyangxuhua
|
9bac560906
|
超级管理员有编辑和删除博客的权限
|
10 years ago |
|
huang
|
9aab10c05a
|
代码更新
|
10 years ago |
|
cxt
|
2ce2134f0b
|
浏览器tab的title，显示用户姓名，不是登录名
|
10 years ago |
|
cxt
|
879f9a0ad5
|
对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天
|
10 years ago |
|
linchun
|
69ec475752
|
组织列表时间倒序排列
|
10 years ago |
|
cxt
|
e97690e2f2
|
“导入作业”改为“从题库选用”
|
10 years ago |
|
cxt
|
90d664bbca
|
学生提交作品时描述框可以直接插入图片，作品列表也直接显示图片。
|
10 years ago |
|
huang
|
a10475fa65
|
公共资源删除、新建代码优化
|
10 years ago |
|
linchun
|
7d5a5f1de2
|
完成项目资源列表中的排序（资源大小，上传时间，下载次数）
|
10 years ago |
|
linchun
|
3fcf192430
|
完成了课程资源列表的排序（上传时间，资源大小，下载次数）
|
10 years ago |
|
huang
|
22ce591c36
|
资源库添加搜索过滤
|
10 years ago |
|
linchun
|
d3ed89d87e
|
sort
|
10 years ago |
|
ouyangxuhua
|
70f4bb1c14
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
ouyangxuhua
|
fe0d31d9c4
|
1.用户信息中的额用户链接改成正确连接；组织资源文件名过长时省略显示
|
10 years ago |
|
ouyangxuhua
|
b716e593b5
|
组织下的链接问题
|
10 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
|
10 years ago |
|
ouyangxuhua
|
2a46d60433
|
组织下的链接的host_name均使用Setting.host_name
|
10 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
|
10 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
|
10 years ago |
|
cxt
|
5476016b79
|
调整题库高度与资源库一致
|
10 years ago |
|
linchun
|
4da8a3828f
|
用户最新列表单位完成，修改了点击最后两页报错的问题
|
10 years ago |
|
linchun
|
df4ad9f597
|
完成管理员界面最近登录列表单位信息
|
10 years ago |
|
huang
|
2b21213b7f
|
公共资源库，排序
|
10 years ago |
|
ouyangxuhua
|
402b0e9c24
|
域名都使用Setting.host_name获取主机名
|
10 years ago |
|
huang
|
3bfaddc80f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
15dfaf67b2
|
测试版环境，登陆注册改成https://test.forge.
|
10 years ago |
|
huang
|
a7990a4c3c
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
ouyangxuhua
|
c0edd91c3d
|
登陆注册链接改为www.
|
10 years ago |
|
yuanke
|
27a2aad3d6
|
修改KE贴吧回复添加视频图片不能显示的BUG
|
10 years ago |
|
huang
|
a1cae3f592
|
admin教师单位获取
|
10 years ago |
|
ouyangxuhua
|
46b50ab065
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
linchun
|
a1bef60bb5
|
Merge branch 'linchun' of https://git.trustie.net/jacknudt/trustieforge into linchun
|
10 years ago |
|
linchun
|
96f65f338c
|
用户列表添加单位
|
10 years ago |
|
huang
|
3d06d5a503
|
Merge branch 'yuanke' into develop
Conflicts:
public/stylesheets/new_user.css
|
10 years ago |
|
ouyangxuhua
|
2899f29b5f
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
yuanke
|
465a236049
|
修改KE贴吧等地图片显示不出来的问题
|
10 years ago |
|
cxt
|
d2a8acf87b
|
个人主页--首页显示不全，右下角也应该显示展开按钮
|
10 years ago |
|
huang
|
7c624cd571
|
公共资源只包括公开资源
|
10 years ago |
|
cxt
|
c770fd157c
|
题库：题目描述变窄，缺省文字：【尹刚提供】
|
10 years ago |
|
ouyangxuhua
|
a2e6f0ee5f
|
1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示
|
10 years ago |
|
cxt
|
3d1f7cc0a8
|
提交作品：作品标题设缺省值：作业名称+“的作品提交”。学生不改就使用缺省值
|
10 years ago |
|
ouyangxuhua
|
a7312a6191
|
修改游客下载组织资源的权限
|
10 years ago |
|
cxt
|
1aa5450e4a
|
题库支持按发布者、来源、类型的排序
|
10 years ago |
|
alan
|
3eaa4b08a3
|
解决删除用户报500错误
|
10 years ago |
|
ouyangxuhua
|
f496761325
|
将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名
|
10 years ago |
|
alan
|
2f5ce553e2
|
refactor user find
|
10 years ago |
|
alan
|
0998ca3974
|
Merge branch 'develop' into FX-alan-search-404
|
10 years ago |
|
alan
|
ce6d63ccaf
|
重构user.find
|
10 years ago |
|
cxt
|
7d2bb572b2
|
Merge branch 'yuanke' into develop
Conflicts:
app/controllers/student_work_controller.rb
public/stylesheets/new_user.css
|
10 years ago |
|
cxt
|
98f7ad19f6
|
Merge branch 'linchun' into develop
|
10 years ago |
|
cxt
|
7f302305ff
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
46d22980c9
|
Merge branch 'cxt_course' into develop
|
10 years ago |
|
cxt
|
a845da5c17
|
点赞有延迟
|
10 years ago |
|
guange
|
45c51ef8db
|
merge
|
10 years ago |
|
guange
|
24a278d7d6
|
加上atall
|
10 years ago |
|
cxt
|
12c60547ad
|
题库支持按引用数和发布时间排序
|
10 years ago |
|
linchun
|
8c145c9d39
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
10 years ago |
|
cxt
|
1d93c6c56b
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
e02bde6f65
|
作品列表支持按学生姓名和学号排序
|
10 years ago |
|
huang
|
97a7694778
|
访问统计数--views
|
10 years ago |
 Tim
|
45f1cfa477
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
8079254089
|
首页增加访问统计
|
10 years ago |
|
Tim
|
53c281103c
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
Tim
|
de3a4718ab
|
个人，课程，项目，组织访问量添加
|
10 years ago |
|
huang
|
c18634be86
|
课程通知。新闻代码优化
|
10 years ago |
 luoquan
|
901409ebb4
|
Merge branch 'yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
|
10 years ago |
|
luoquan
|
1900a824e8
|
0
|
10 years ago |
|
alan
|
1f5c90185a
|
修复《顶部搜索“分析”报404错误》
|
10 years ago |
|
cxt
|
dcd13b9d6b
|
点击个人主页的课程和项目在新的tab页中打开
|
10 years ago |
|
cxt
|
94c1e38066
|
分组作业动态中的“创建项目”更换颜色
|
10 years ago |
|
cxt
|
ef5625ccdf
|
延期发布的课程资源设为公开后不应对学生可见
|
10 years ago |
|
huang
|
47ca79c317
|
news消息已读修改
|
10 years ago |
|
cxt
|
2812fcd2fb
|
删除无用代码
|
10 years ago |
|
luoquan
|
a418c0937d
|
Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan
Conflicts:
public/assets/kindeditor/kindeditor.js
public/assets/kindeditor/plugins/code/previewcode.css
|
10 years ago |
|
luoquan
|
7d70e63f8d
|
代码重置
|
10 years ago |
|
alan
|
89438364cf
|
Merge branch 'develop' into FX-alan-message-access-slow
|
10 years ago |
|
alan
|
55983093fd
|
优化课程反馈页面
|
10 years ago |
|
ouyangxuhua
|
bc5ce1fd22
|
组织下的课程帖子链接参数正确传输
|
10 years ago |
|
cxt
|
a7b9d8424a
|
只有全部列表中的学生可编辑分班
|
10 years ago |
|
ouyangxuhua
|
eb3c0d9334
|
组织设置为公开后，允许游客下载选项变为可选；老师的提交作业消息不显示
|
10 years ago |
|
huang
|
440cd04414
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
cxt
|
0d8052da28
|
老师把学生加入某一个分班
|
10 years ago |
|
huang
|
5818860a4d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
766569afa6
|
1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间
|
10 years ago |
|
huang
|
08cb7b642c
|
附件上传样式
|
10 years ago |
|
huang
|
1644442d2e
|
修改附件描述样式
|
10 years ago |
|
huang
|
627580a9ac
|
标签问题（未完）
|
10 years ago |
|
cxt
|
fa3fd56686
|
题库发送课程的弹框搜索不能用
|
10 years ago |
|
cxt
|
c255325300
|
添加分班
|
10 years ago |
|
yuanke
|
7f7979e955
|
修改回复时可多次点击发送按钮的问题。
|
10 years ago |
|
huang
|
281d31980d
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
cxt
|
0fb808e2fd
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
c947121e2b
|
消息不显示问题（未完）
|
10 years ago |
|
cxt
|
9fd0951ec3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
10 years ago |
|
cxt
|
cd1409f950
|
还原学生分班
|
10 years ago |
|
ouyangxuhua
|
6cf518e2e4
|
1.组织的非成员用户，隐藏上传资源/导入资源；2.申请的子域名，一律改成小写
|
10 years ago |
|
ouyangxuhua
|
680bdc3d34
|
组织下的链接改成https://www.
|
10 years ago |
|
ouyangxuhua
|
f917e96a12
|
组织栏目中的链接的url更新
|
10 years ago |
|
cxt
|
8a4175dc02
|
点击学生作品列表中的编程作品，代码会跳到上一个作品的详情
|
10 years ago |
|
cxt
|
f8f36f9f29
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
cc441826ee
|
测试代码即提交代码 系统得分为当次的测试得分
|
10 years ago |
|
Tim
|
5d3d73a783
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
Tim
|
61ce439e74
|
添加老师对学生的分班操作
|
10 years ago |
|
cxt
|
5b4ff5ec8a
|
学生列表中的作业积分为负分
|
10 years ago |
|
ouyangxuhua
|
16b0bf9c80
|
更新组织栏目优先级，如果输入不合法，则不作改变
|
10 years ago |
|
ouyangxuhua
|
a51ca428be
|
组织中，增加调整栏目显示顺序的功能
|
10 years ago |
|
huang
|
3d2ba83c36
|
@消息问题修复
|
10 years ago |
|
huang
|
5a4f422b1c
|
消息分页问题
|
10 years ago |
|
huang
|
53e164048d
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
2a1eac02a9
|
Merge branch 'hjq_new_course' into szzh
|
10 years ago |
|
huang
|
b4800585e7
|
解决消息 信息500问题
|
10 years ago |
|
huang
|
84d7049add
|
fork弹出新页面，解决间接性500问题
|
10 years ago |
|
huang
|
99be187d54
|
版本库 无法预览的文件提供直接下载功能
|
10 years ago |
|
cxt
|
db1f31724a
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
d3489ec5cb
|
作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间
|
10 years ago |
|
ouyangxuhua
|
713c28c0b5
|
个人页面快捷操作课程/项目的设置公开/私有属性，确定的提示信息要正确
|
10 years ago |
|
Tim
|
d6d8e231e6
|
课程推荐在ie中显示bug
|
10 years ago |
|
huang
|
f469e51202
|
课程模块/通知、作业、留言、发帖，删除的时候统计数字递减
|
10 years ago |
|
ouyangxuhua
|
5d1d56fbb3
|
组织下链接改成https://www.形式
|
10 years ago |
|
huang
|
f022950408
|
Merge branch 'develop' into hjq_new_course
|
10 years ago |
|
Tim
|
141c0be24f
|
上传资源弹窗样式调整
|
10 years ago |
|
ouyangxuhua
|
6e21229b4c
|
组织用户链接
|
10 years ago |
|
ouyangxuhua
|
4442d286ce
|
组织下的用户连接改成https://www.……形式
|
10 years ago |
|
linchun
|
3e70db4e82
|
Merge branch 'develop' into linchun
Conflicts:
db/schema.rb
|
10 years ago |
|
huang
|
2fdddc6488
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
10 years ago |
|
huang
|
ec4a3b321c
|
更新历史版本，下载次数，引用次数不清零
|
10 years ago |
|
linchun
|
3c66a29767
|
完善课程资源列表，完成项目资源列表
|
10 years ago |
|
cxt
|
ca094a13b5
|
优秀作品排行中，不允许访问的，就取消链接。老师设置了完全公开的作品，就有链接
|
10 years ago |
|
cxt
|
f0e3fe8ff7
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
10 years ago |
|
cxt
|
2ee93f9f86
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
3424be695e
|
题库：发送的弹框中，不要出现已经删除的课程
|
10 years ago |
|
guange
|
3c513085d2
|
request变量
|
10 years ago |
|
ouyangxuhua
|
c3eb8e05cd
|
组织的私有资源，数量一致
|
10 years ago |
|
ouyangxuhua
|
d70df6a89d
|
公开组织的资源，非成员不能看到私有资源
|
10 years ago |
|
ouyangxuhua
|
699e1f41a7
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
ouyangxuhua
|
ce187b4212
|
组织资源下载权限控制
|
10 years ago |
|
cxt
|
64b6af6177
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
91d000c8f3
|
编程作业：编程测试集的弹框中，多行却只显示一行
|
10 years ago |
|
Tim
|
56372fbdd5
|
积分规则显示样式调整
|
10 years ago |
|
linchun
|
b7f4b584f2
|
完成管理员界面课程资源列表
|
10 years ago |
|
ouyangxuhua
|
2ea553e988
|
Merge branch 'ouyangxuhua' into develop
|
10 years ago |
|
ouyangxuhua
|
0df34dd3ee
|
组织资源栏目，过滤条件“其他”内容
|
10 years ago |
|
cxt
|
f8ce6d48d3
|
模拟答题的返回按钮应该回到课程作业列表
|
10 years ago |
|
cxt
|
e30c26aa09
|
课程报500
|
10 years ago |
|
ouyangxuhua
|
a0363b5511
|
组织资源发送后，发送次数动态增加
|
10 years ago |
|
ouyangxuhua
|
319f286a65
|
解决一下问题：1.组织的资源的引用计数不会增加；2.组织资源栏目中，文件的宽度不合适
|
10 years ago |
|
cxt
|
fcae91ecc1
|
“课程通知”改为“通知”
|
10 years ago |
|
cxt
|
cff5e9171f
|
导入作业后页面不应跳转到被导入的作业页面
|
10 years ago |
|
ouyangxuhua
|
984cd76b7f
|
Merge branch 'develop' into ouyangxuhua
|
10 years ago |
|
ouyangxuhua
|
b77b63bbf1
|
解决私有组织栏目通过url能访问的问题
|
10 years ago |
|
huang
|
d6dedf03cb
|
去掉puts注释
|
10 years ago |
|
huang
|
d30e73795d
|
积分规则
|
10 years ago |
|
huang
|
4f2937e1a2
|
英雄榜
|
10 years ago |
|
huang
|
a079a61c82
|
回复数
|
10 years ago |
|
huang
|
d54609075b
|
区分新闻和新闻回复得分
|
10 years ago |
|
huang
|
6ceb4f4549
|
Merge branch 'develop' into hjq_new_course
Conflicts:
app/models/course_contributor_score.rb
app/views/organizations/_org_course_homework.html.erb
app/views/users/_homework_search_input.html.erb
app/views/users/_show_user_homeworks.html.erb
app/views/users/_user_homework_detail.html.erb
app/views/users/_user_homework_form.html.erb
app/views/users/user_homework_type.js.erb
app/views/users/user_homeworks.html.erb
app/views/users/user_homeworks.js.erb
|
10 years ago |
|
huang
|
bafa151c0d
|
0
|
10 years ago |
|
huang
|
3f56fa3405
|
0
|
10 years ago |
|
huang
|
f381784a3c
|
数据迁移
|
10 years ago |
|
huang
|
814e766577
|
课程过滤
|
10 years ago |
|
huang
|
e4d669251f
|
英雄榜得分
|
10 years ago |
|
huang
|
4cf80fe441
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
6ce947667d
|
课程英雄榜提示
|
10 years ago |
|
cxt
|
782bbc775b
|
公共资源库的统计
|
10 years ago |
|
huang
|
de1c2e18c8
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
huang
|
38fca02193
|
注释搜索
|
10 years ago |
|
huang
|
ae40a4ea61
|
公共资源相关功能
|
10 years ago |
|
cxt
|
3deaa492b2
|
编辑作业时作业描述被解析了
|
10 years ago |
|
cxt
|
4f3055c990
|
讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。
|
10 years ago |
|
cxt
|
fd8b40a36e
|
对于编程作业，系统评分的前几名能否也显示出来
|
10 years ago |
|
huang
|
91b8a81b9d
|
去掉全站搜索
|
10 years ago |
|
huang
|
bbbf13084e
|
修改搜索功能，页面跳转
|
10 years ago |
|
cxt
|
947e6ea469
|
作业--“禁用匿评”处增加提示语：匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品。
|
10 years ago |
|
cxt
|
ffac8164f1
|
管理员的课程和项目列表，按照时间倒排
|
10 years ago |
|
linchun
|
bb8a6af13e
|
admin界面添加精品课程页面，目前该页面中的精品课程是固定的
|
10 years ago |
|
cxt
|
a5cb3d5e6a
|
新建作品时的输入框改为“请输入作品名称”、“请输入作品描述”
|
10 years ago |
|
cxt
|
d2920c64ea
|
题库作业发送到课程后增加提示
|
10 years ago |
|
huang
|
dfddb30ca3
|
附件引用
|
10 years ago |
|
cxt
|
6ca702eb2c
|
题库发送的课程列表中不包含当前作业所在的课程
|
10 years ago |
|
cxt
|
8aff404f0c
|
题库过滤作业的搜索
|
10 years ago |
|
huang
|
9beaa62d6d
|
课程活跃度
|
10 years ago |
|
huang
|
50011985a9
|
课程资源库添加资源描述
|
10 years ago |
|
cxt
|
b333c40ce0
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
public/stylesheets/public.css
|
10 years ago |
|
cxt
|
e2ff348075
|
题库的作业过滤
|
10 years ago |
|
cxt
|
0cd536fcc9
|
题库增加发布者姓名搜索
|
10 years ago |
|
huang
|
596d4e17e9
|
解决样式冲突
|
10 years ago |
|
huang
|
97e6299a2b
|
Merge branch 'hjq_new_course' into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
|
10 years ago |
|
huang
|
95346bb419
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/views/layouts/_logined_header.html.erb
public/stylesheets/public.css
|
10 years ago |
|
huang
|
5ab9e3b5b7
|
资源搜索
作业留言
|
10 years ago |
|
huang
|
e9c9112b38
|
公共资源封装
|
10 years ago |
|
huang
|
ba9b22fbe1
|
公共资源，删除、重命名
|
10 years ago |
|
guange
|
79004e1328
|
修改绑定流程
|
10 years ago |
|
huang
|
3dacf900d5
|
修改导入公共、我的资源
|
10 years ago |
|
huang
|
085729f91b
|
课程活跃度中添加作业留言得分
|
10 years ago |
|
huang
|
fee7cc4b2c
|
课程推荐中不显示私有课程
|
10 years ago |
|
huang
|
ef57dc80d4
|
去掉项目名称
|
10 years ago |
|
huang
|
5cf198c61a
|
课程教师、学生列表添加成员管理入口，项目成员列表入口
|
10 years ago |
|
cxt
|
8e5abe997a
|
已禁用匿评的作业还显示匿评截止时间不合适
|
10 years ago |
|
huang
|
8815e99db5
|
资源上传跳转问题
|
10 years ago |
|
cxt
|
050257e885
|
作业添加挂起的状态
|
10 years ago |
