Commit Graph

10563 Commits (alan_develop)

Author SHA1 Message Date
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
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 编辑作业的时候,还要选择作业发布的课程不合理,影响体验
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
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
10 years ago
huang 28cb1755d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
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
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
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
10 years ago
ouyangxuhua 2a46d60433 组织下的链接的host_name均使用Setting.host_name
10 years ago
huang 5681d329d6 Merge branch 'develop' into hjq_new_course
10 years ago
huang bf4116906f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
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
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