Commit Graph

1061 Commits (df70c33bcd4c86805cb0b52b65f1028d3200dffe)

Author SHA1 Message Date
huang 157502d450 精品课程
9 years ago
huang 20d550e755 提交次数默认值为空的数据处理
9 years ago
huang 09d2796ca7 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
Tim 13e289dfb5 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
9 years ago
Tim 8feea07825 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
Tim 4493261797 自动生成文件
9 years ago
huang 440be81587 Merge branch 'develop' into szzh
9 years ago
huang f3402e4fa4 项目得分新计算
9 years ago
ouyangxuhua a1f8db65fc Merge branch 'szzh' into dev_hjq
9 years ago
huang 49d456bf21 修改数据统计信息
9 years ago
huang a68392fd24 issue统计数据更新
9 years ago
huang e808f0bc61 提交新迁移
9 years ago
cxt 90acb7816f 数据迁移
9 years ago
cxt f7a88a63e0 更新项目缺陷动态的更新时间
9 years ago
Tim 3d73a3c243 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
9 years ago
cxt e889f798d7 项目创建动态报500
9 years ago
Tim d495f58408 切换分支文件
9 years ago
Tim 88895ff262 英文文本强制折行修复
9 years ago
huang 05cf2d24dc 新项目积分系统
9 years ago
huang 165d5f50c8 Merge branch 'develop' into hjq_new_course
9 years ago
huang cf7130a398 0
9 years ago
huang a0ceb9b11c 添加缺陷回复统计
9 years ago
ouyangxuhua 7bcf995eaf Merge branch 'develop' into dev_hjq
9 years ago
ouyangxuhua 5d9ce929d9 组织栏目子目录
9 years ago
huang a74e5f9d30 添加项目动态数迁移
9 years ago
huang 8758235364 issue创建和删除的时候,issues_count+1
9 years ago
huang 1239a8b5af 统计数据迁移
9 years ago
ouyangxuhua 25a24f72e5 快捷菜单使用新的样式及链接
9 years ago
huang f3b732460c 添加项目统计字段
9 years ago
cxt 7c376ed60b 数据迁移
10 years ago
huang 580e4d7327 迁移问题
10 years ago
huang 5b9be0bb11 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
ouyangxuhua d574521b48 样式更新
10 years ago
ouyangxuhua 66bf50098a 增加组织/个人屏蔽项目/课程动态功能
10 years ago
huang fd2197a73d 项目资源库历史数据迁移
10 years ago
ouyangxuhua e90a237a8a 2.1博客增加“设为主页”的功能
10 years ago
ouyangxuhua eacf89100d Merge branch 'szzh' into dev_hjq
10 years ago
ouyangxuhua 7d4e3cdd5c 1.增加项目/课程快捷功能;
10 years ago
huang 0a1aa9e569 Merge branch 'develop' into hjq_new_course
10 years ago
ouyangxuhua d8c6775f42 1.解决“组织动态中的作业动态,评分设置弹框不能关闭 ”的问题;
10 years ago
huang be218baa52 添加迁移:项目讨论区数据重复问题
10 years ago
huang 470f45becd 课程讨论区(未完)
10 years ago
huang 11444f43f0 解决issue多附件,删除一个附件后,提交弹出白色框框的问题
10 years ago
lizanle d26b51c982 Merge branch 'szzh' into dev_zanle
10 years ago
cxt 9b974b6170 Merge branch 'cxt_course' into szzh
10 years ago
ouyangxuhua 806e4caf5a 1.增加隐藏组织栏目功能;2.未登录情况,隐藏部分内容。
10 years ago
lizanle b059ab2428 schema.rb
10 years ago
cxt ec631691e3 新建课程和课程配置页面增加结束学期
10 years ago
lizanle be146a9421 Merge branch 'szzh' into dev_zanle
10 years ago
ouyangxuhua e9cedf0eb9 删除冗余的迁移文件
10 years ago
ouyangxuhua d1ebc35e43 Merge branch 'develop' into dev_hjq
10 years ago
ouyangxuhua d1c7aad742 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
ouyangxuhua 40bf109223 给资源栏目增加board
10 years ago
lizanle 90c63192e6 历史资源模型修改
10 years ago
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能
10 years ago
ouyangxuhua 77e0f0cd08 转发帖子新建帖子,并更新相关表
10 years ago
huang 41cd038758 讨论区帖子添加锁定
10 years ago
ouyangxuhua 0d98dba25c 解决项目新建帖子中,点击取消按钮没有反应的问题
10 years ago
ouyangxuhua 2076c9b449 Merge branch 'develop' into dev_hjq
10 years ago
cxt e86778a9c7 删除不存在的留言动态
10 years ago
Tim b0b4527ea1 Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
10 years ago
ouyangxuhua 73d377d06d 组织资源栏目显示转发的帖子
10 years ago
ouyangxuhua b9ae579622 将课程帖子转发至组织帖子栏目
10 years ago
ouyangxuhua 2220e0b7cc 增加帖子-组织栏目关联表
10 years ago
houxiang 3e57237969 修改了整个提交记录总数,运用了黄总的修改的gitlab API by 侯翔
10 years ago
houxiang e8511a6210 modify the gemfile conflict by hx
10 years ago
huang dae6e68623 renwu
10 years ago
huang 747493993b 上线测试
10 years ago
cxt 4d82beb4c7 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
lizanle 793a98ade1 forge_activities那个运行批量删除回复动态脚本改动
10 years ago
cxt c6e7c8860d dd
10 years ago
lizanle 70f93741d6 issue图标问题
10 years ago
lizanle bba40de36d journal不应该算入ForgeActivity,历史数据应该删除
10 years ago
lizanle 5d47afdc43 issue 删除回复的权限问题
10 years ago
guange d703f75c98 merge
10 years ago
guange eb97f7dfb2 merge
10 years ago
huang b87943ff1d Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
10 years ago
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle
10 years ago
guange fc63dfcb7b 消息通知
10 years ago
huang 721a007779 删除 由于course、project一张表而引起的历史数据异常问题
10 years ago
lizanle 71f6a637e0 帖子按时间倒排
10 years ago
guange c0de5d55de 加入了issue的at消息提醒
10 years ago
cxt 5cf88a287b 分组作业提示语的修改
10 years ago
huang 41bb37d6d4 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
huang 06e5784436 解决英雄榜两个用户同时存在的but
10 years ago
cxt 481b7b96eb 正式版报500
10 years ago
cxt 699d0e22dd 删除多余学生的测验数据
10 years ago
ouyangxuhua 0602a03e12 组织资源类型的栏目,增加搜索功能
10 years ago
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
10 years ago
cxt 27ed6df9d6 Merge branch 'szzh' into develop
10 years ago
huang fed989753a 修复林处账号不能查看消息的问题
10 years ago
huang 9710731a2c 课程配置添加登录名
10 years ago
huang fbba933a46 Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
10 years ago
huang be940ee3aa Merge branch 'develop' into hjq_new_course
10 years ago
ouyangxuhua 1e652faec7 Merge branch 'develop' into dev_hjq
10 years ago
lizanle 433059e1bc schema
10 years ago
ouyangxuhua 2f7260cba2 1.在栏目表中增加field_type(类型)字段;
10 years ago
ouyangxuhua 09f0d0201e 组织增加栏目发帖功能
10 years ago
cxt a9f6e817b4 分组作业关联项目
10 years ago
huang ac9f13c842 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
10 years ago
huang 916d99be82 课程删除功能
10 years ago
houxiang 56cb83ffba 版本库首页没有统计commit_count,具体的详情页在开始统计
10 years ago
huang 42f5b86d95 添加字段删除课程
10 years ago
huang 068c305c06 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course
10 years ago
cxt b61a0a98e5 Merge branch 'develop' into cxt_course
10 years ago
huang bd3d0547f5 组织样式修改
10 years ago
huang 9d7bc17115 Merge branch 'develop' into dev_hjq
10 years ago
ouyangxuhua ab4d0e4678 组织界面增加分栏
10 years ago
lizanle 4c00312f45 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 0a5a33c2de schema
10 years ago
huang 4d0956dff1 Merge branch 'develop' into gitlab_guange
10 years ago
huang 9f73807e05 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
10 years ago
huang c1747ab217 fork重名,提交
10 years ago
huang 8f024bdf4d Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
10 years ago
huang 89b8f7783d 添加forked_form的id
10 years ago
cxt fd51b02e16 添加修订附件
10 years ago
cxt 77e96af78f 还原分组作业
10 years ago
cxt f90ff781ab 学生提交作品页面的合作成员弹窗
10 years ago
cxt fee438cc0b Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
10 years ago
cxt ebeaac5798 作业匿评的结束状态未更新
10 years ago
ouyangxuhua 6f9c89d67b 1.更改首页内容,不显示作者等信息,增加取消首页、编辑首页、删除首页等功能;
10 years ago
huang 364c9a3a9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
huang 39b87aaaac 为student_work表添加索引
10 years ago
lizanle d266237590 kaminari分页添加上一页下一页
10 years ago
lizanle 3c946c034a Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 885215fb8f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle 96290ad975 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 487c6bad09 schema.rb
10 years ago
huang f91918145d 0
10 years ago
huang 634e11d0ec 0
10 years ago
huang b130b52a23 修改迁移
10 years ago
Tim 580cc6b8d8 系统自动生成文件
10 years ago
huang 501a8f905b Merge branch 'develop' into szzh
10 years ago
huang 36b1649fbd Merge branch 'szzh' into gitlab_guange
10 years ago
huang 2ec78d07fa Merge branch 'szzh' into hjq_new_course
10 years ago
ouyangxuhua e0f4050779 1.修改组织中关联项目和课程的内容和样式
10 years ago
huang 042b197767 课程英雄榜界面调整
10 years ago
houxiang c6b5abba4e hide the the count of project'repo
10 years ago
huang 8c83bbfff3 课程英雄榜数据
10 years ago
huang aca7684414 课程英雄榜
10 years ago
cxt cc0ff6bbc0 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
10 years ago
cxt c9f844b9ba Merge branch 'sw_new_course' into develop
10 years ago
lizanle 4efb660214 全站搜索
10 years ago
huang c8b1cae947 建立贡献榜表及相关关联
10 years ago
Tim d1f16a0851 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
Tim ec42cd2d7f 系统自动生成文件
10 years ago
ouyangxuhua ccfbc1e0bd 1.组织翻页增加type参数;
10 years ago
cxt 9b033c3adf 数据日志
10 years ago
huang 55ff5f4931 Merge branch 'develop' into gitlab_guange
10 years ago
huang a174cade83 commit by hx , 2015/11/13
10 years ago
cxt f262a7cc13 cffd
10 years ago
huang fd03e62957 添加字段迁移
10 years ago
huang 1df8c94b98 解决字符过长不能保存成功的问题
10 years ago
huang dd148fb7c5 Merge branch 'szzh' into sw_new_course
10 years ago
ouyangxuhua 5ac65d86b1 将org_document_comment中的title改成text类型
10 years ago
Tim e3d78bf4f0 组织样式更改
10 years ago
cxt 99945d5bb5 学生答题界面的修改
10 years ago
huang 3deebf2006 show
10 years ago
ouyangxuhua 4d4b163f17 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
ouyangxuhua d71d9730bd 修改迁移文件的bug
10 years ago
huang 7dc16775dc 添加字段迁移
10 years ago
lizanle dffabce806 Merge branch 'dev_zanle' into szzh
10 years ago
lizanle 56e96a035b schema.rb
10 years ago
houxiang 4a9da97f9b modify by hx add commit_count_detail_show
10 years ago
cxt 249b15751d 新建多选题
10 years ago
ouyangxuhua f6251b758b 1.迁移课程动态数据至组织动态
10 years ago
huang 282c7f5bd2 修改添加题目相关
10 years ago
ouyangxuhua 71bf80c7a5 1.创建组织课程关联表,建立相应模型及控制器;
10 years ago
lizanle 291868ba43 Merge branch 'szzh' into dev_zanle
10 years ago
lizanle 0eff2bcb74 课程添加允许学生发布资源的配置
10 years ago
huang 23ca20692f 问卷部分方法
10 years ago
cxt 167d001b3f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 5400b907e6 学生测验列表
10 years ago
ouyangxuhua 687c0c8306 Merge branch 'szzh' into dev_hjq
10 years ago
ouyangxuhua d220dbbc9a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
ouyangxuhua 10dedcb7be 增加组织成员加入时间
10 years ago
ouyangxuhua de32745eef 1.将项目动态数据迁移至组织动态;
10 years ago
cxt 10ac8eaa35 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
houxiang 9350841d50 change by hx
10 years ago
cxt 62d80c27d6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
10 years ago
cxt 24e9f5e7d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt a50ec626cd 数据
10 years ago
lizanle b88d5e59a1 回复的时候会多出一条一模一样的内容
10 years ago
cxt ee8d9d7b4e 提交
10 years ago
ouyangxuhua 78e1ae4188 Merge branch 'szzh' into dev_hjq
10 years ago
ouyangxuhua 71e6a8b135 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
sw 466f3c4cc3 数据库修改以及一对一,一对多,多对多等关系的确立
10 years ago
sw bbf087fa67 数据库的修改以及model数据关系的确定
10 years ago
sw 5a153637b7 增加在线测试迁移问卷
10 years ago
lizanle b24fadea05 设置 删除 编辑按钮做成项目一样的
10 years ago
cxt ab868d7b65 课程通知增加置顶
10 years ago
ouyangxuhua a3443ba968 组织模块功能实现
10 years ago
cxt 2a82f33227 个人首页的留言动态显示不合理
10 years ago
lizanle 8e66bb8fe1 在课程 项目 上传资源后跳转到对应的资源库界面
10 years ago
ouyangxuhua 283af137c6 组织模块动态及配置
10 years ago
Tim 223b17d8fe 普通作品列表、系统评分作品列表、匿评作品列表格式修改
10 years ago
huang 4608190529 增加点击选择历史版本记录
10 years ago
cxt 958532bedc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt ee7b21de72 禁用匿评功能
10 years ago
ouyangxuhua eadab840b6 建立组织、成员表及模型控制器;
10 years ago
ouyangxuhua 636063c6ca 添加组织表和组织成员表
10 years ago
cxt 3bb56f1606 教辅可查看未发布的作业
10 years ago
cxt f5aaf7ac58 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt 6dcc97d5d1 添加作业的发布功能
10 years ago
lizanle c2be8b4eec 课程大纲界面
10 years ago
Tim 61dc979ee4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
Tim e58dcc851b 资源库搜索图标替换
10 years ago
huang 294a517251 查看所有提交记录入口
10 years ago
huang 4c61e7490b Merge branch 'develop' into gitlab_guange
10 years ago
lizanle 2a76461cd1 简单博客功能
10 years ago
huang 1157dcaa06 版本库summary
10 years ago
huang 147cdf3018 Merge branch 'szzh' into gitlab_guange
10 years ago
cxt d049a00655 删除课程动态中未发布问卷的动态
10 years ago
cxt 90ee4bbe60 删除空的课程动态
10 years ago
cxt dbbdae1be2 附件迁移文件的修改
10 years ago
cxt 0b565b1be0 私有课程的课件迁移
10 years ago
guange 6086c9304e merge
10 years ago
guange 9e8e77f3e1 方法重构
10 years ago
cxt 5f3c8d928d 作业批次下拉列表的样式修改
10 years ago
huang 150ee3d28d Merge branch 'szzh' into gitlab_guange
10 years ago
cxt caa278d9f5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
lizanle b3d15b886a 学校的查询与现实问题重做
10 years ago
guange 9266eccdff Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
10 years ago
guange 716f0f31b3 merge
10 years ago
cxt ea66ca5e00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt 8abc97ae84 个人主页添加个人留言动态
10 years ago
guange 6472367b68 firefox粘贴图片只能一张的bug
10 years ago
cxt b9b7f6fa9e 个人主页留言动态的实现
10 years ago
huang 73898953d9 project表添加字段,记录project对应gitlba中project id
10 years ago
huang fbeb6585d2 去掉初始化输出提示
10 years ago
huang 7c1bb8b9ed Merge branch 'szzh' into gitlab_guange
10 years ago
lizanle d8a4e4d710 issue序号丢失的问题
10 years ago
sw 11736eb266 迁移文件有问题
10 years ago
cxt 452766bade 课程通知的动态排序时间调整
10 years ago
sw 774b00f2d4 数据迁移错误
10 years ago
huang 5f26e331c6 缺陷截止时间到了消息通知
10 years ago
cxt a2d6168043 课程动态的数据迁移
10 years ago
cxt 6a3089bb9b 动态的回复图片超出边框
10 years ago
cxt c81e07d588 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt 223bac373f 课程动态的数据迁移
10 years ago
guange 08eecbd5ec merge
10 years ago
huang 25a604d7b8 issue解决冲突
10 years ago
huang 38ba47f8c8 讨论区结构修改
10 years ago
guange 0b4c8b05f1 JAVA语言支持
10 years ago
sw f2325dee88 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
10 years ago
cxt a37f39558d 项目和课程的列表符号样式修改
10 years ago
sw 7a62b7f13d 增加匿评开启时间和匿评关闭时间,并对其业务逻辑进行js的控制。以及这两个值得修改
10 years ago
sw 385f2aa4ac 111
10 years ago