 alan
|
dfe9cb0c68
|
Merge branch 'develop' into alan_develop
|
10 years ago |
|
alan
|
90fd52970b
|
fix bugger on 资源区
|
10 years ago |
 ouyangxuhua
|
598f69abb0
|
组织显示模式暂时隐藏
|
10 years ago |
 cxt
|
b9f1ff3cd2
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
10 years ago |
|
cxt
|
ed0eb4aff3
|
学生作品详情无法打开
|
10 years ago |
 yuanke
|
0217dc0054
|
Merge branch 'yuanke' into develop
|
10 years ago |
|
yuanke
|
213cf48c09
|
编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管
|
10 years ago |
|
alan
|
395fb8fae6
|
修改pagination,资源区bug
|
10 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 |
|
huang
|
b8463fcca5
|
北斗
|
10 years ago |
|
cxt
|
33c9331c7b
|
课程设置为私有/公开 课程头部未刷新
|
10 years ago |
|
huang
|
74a4e80795
|
Merge branch 'ouyangxuhua' into hjq_beidou
|
10 years ago |
|
huang
|
9fc227d619
|
资源库问题
|
10 years ago |
|
huang
|
4b6b5504ca
|
北斗框架（未完）
|
10 years ago |
|
ouyangxuhua
|
67ff9fb6e2
|
组织显示模式功能
|
10 years ago |
|
ouyangxuhua
|
f4b4bf40de
|
增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择
|
10 years ago |
|
huang
|
326730f6b1
|
北斗框架
|
10 years ago |
|
yuanke
|
f217c9097a
|
全部正确需要提示是否提交
|
10 years ago |
|
yuanke
|
88ba2bf556
|
编译错误处理
|
10 years ago |
|
yuanke
|
5116d75eb7
|
编程作业空格用□表示
|
10 years ago |
|
yuanke
|
e62ee2eade
|
修改评测问题
|
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 |
|
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 |
|
huang
|
e20fe85ddf
|
消息去掉tip
|
10 years ago |
|
huang
|
70d594659e
|
课程英雄榜代码封装
|
10 years ago |
|
huang
|
e06695b56b
|
课程活跃度代码封装
|
10 years ago |
|
huang
|
e77a891bc6
|
消息查询语句优化，添加索引
|
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 |
