jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
19,396 Commits 98 Branches 0 Tags 0 B
Commit Graph

15665 Commits

Author SHA1 Message Date
huang c080cf6c94 pull request添加jenkins执行过程结果 2018-06-10 20:31:42 +08:00
huang d82d6817f9 关联pull request和qa 2018-06-08 17:14:57 +08:00
huang df14ef85a2 没次pull rquest显示质量评测效果 2018-06-08 17:05:35 +08:00
huang ca8952581a 项目添加语言配置/Jenkins分析和Merge Request关联 2018-06-08 17:00:10 +08:00
huang 26177f7154 字符串拼接问题 2018-06-08 15:04:37 +08:00
huang 0de36058df 规范jenkins jobname（纯数字不允许创建） 2018-06-08 14:59:40 +08:00
huang 4c1c2b5dae 访问为定义问题、添加'nokogiri'解析 2018-06-08 14:51:47 +08:00
huang 45df75da1c 取最新commit_id 2018-06-08 14:38:55 +08:00
huang 2849fc2d3c 修复pull request判断是否有跟新的接口异常问题 2018-06-08 11:26:47 +08:00
huang 5d4e27a796 jenkins异常打印 2018-06-08 11:02:17 +08:00
huang 02a0a244f6 pull request identifier没定义 2018-06-08 10:47:54 +08:00
huang ebb7afe9e5 pull request添加错误日志 2018-06-08 10:31:07 +08:00
huang dc41da89c4 针对某些项目进行测试 2018-06-07 17:14:53 +08:00
huang edd777aacc pull request的时候启动jenkins尺寸集成sonar分析 2018-06-07 16:39:09 +08:00
cxt b618b135ad 去掉“同步北大数据”的按钮 2018-06-06 10:47:12 +08:00
cxt f69a12d6e7 导入数据时多个“|” 2018-06-05 15:57:48 +08:00
cxt 927158fbae 北大数据的导入 2018-06-05 14:58:45 +08:00
huang e12b304f1b 修复代码质量500问题 2018-05-18 11:34:02 +08:00
huang 971672a366 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-05-18 10:51:28 +08:00
huang 0583b29382 质量分析500问题 2018-05-18 10:51:04 +08:00
cxt 1727deb52e 数据的调整 2018-05-11 10:05:18 +08:00
cxt 45321dd6fe 数据量的千分位显示、精确到一位小数 2018-05-10 17:25:00 +08:00
cxt 75349207a0 数据的新建和编辑的调整 2018-05-09 15:57:30 +08:00
cxt 9e7e22525e 数据的排序调整 2018-05-09 10:35:33 +08:00
cxt d3f2b616c1 数据的过滤 2018-05-09 09:49:00 +08:00
cxt 232c556fa8 调整 2018-05-08 16:48:07 +08:00
cxt cc008e3160 调整 2018-05-08 16:46:03 +08:00
cxt aa8050a913 调整 2018-05-08 16:43:09 +08:00
cxt f70f139699 调整 2018-05-08 16:42:33 +08:00
cxt 0fe00bce50 调整 2018-05-08 16:33:25 +08:00
cxt 2a8aad92d6 数据的调整 2018-05-08 16:25:59 +08:00
cxt 5dd5192822 数据模块的调整 2018-05-07 14:55:00 +08:00
cxt a082d7a8eb 数据模块的调整 2018-05-07 11:26:40 +08:00
huang b2654b006f yangshi 2018-05-06 14:44:14 +08:00
huang e197e7c024 输入框Mb样式调整 2018-05-06 14:32:31 +08:00
cxt 075091beda 数据增加数据源大小 2018-05-04 17:17:07 +08:00
daiao cb71a45efc 数据源大小 2018-05-04 15:38:05 +08:00
cxt 46df3c2d67 班级相关页面的优化 2018-03-23 15:54:50 +08:00
daiao ba73d7a30c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-03-22 16:54:58 +08:00
daiao 8d437eb539 课程代码优化 2018-03-22 16:53:14 +08:00
cxt dd69848e34 同一个人给的多个匿评评分请在一个区域按照时间倒序显示，现状让用户误以为被多个不同用户给匿评了 2018-03-22 14:58:40 +08:00
cxt 938b2501b6 从题库选用编程作业后，样例测试都丢掉了 2018-03-21 17:47:33 +08:00
cxt d095e7bf54 展开/收起评阅详情 2018-03-21 17:25:49 +08:00
cxt cb8148d8a0 别人对自己的评分记录没有显示，也没有选项可操作 2018-03-21 17:09:56 +08:00
cxt 5b03de8596 课程首页报500 2018-03-20 17:22:57 +08:00
cxt e9aa22cdee 班级作品列表评阅弹框中，增加“展开评阅详情”的复选项 2018-03-16 17:37:14 +08:00
cxt 2ea79057c9 课程下创建新班级，提供可选项选择是否继承原有资源等实现方法 2018-03-16 16:08:39 +08:00
cxt b8c916deb3 360浏览器操作更改单位名称，没有下拉选项 2018-03-16 09:19:51 +08:00
cxt 352b092980 质量分析 2018-03-15 11:18:42 +08:00
cxt 55afcd0e8c 加日志 2018-03-15 10:58:31 +08:00
cxt bb1963129d 质量分析加日志 2018-03-15 10:24:57 +08:00
cxt 1396a56e06 作品列表报500 2018-03-07 17:00:43 +08:00
daiao 4dbeda8c21 作业报500 2018-03-06 17:44:02 +08:00
daiao 64ec418376 详情有返回按钮 2018-02-09 18:51:47 +08:00
huang 1409995e66 https问题 2018-02-09 18:38:07 +08:00
huang 25a4d05eb8 解决http冲突问题 2018-02-09 18:34:47 +08:00
daiao cca2433332 上线缺陷报错 2018-02-09 18:26:44 +08:00
daiao d2fece9793 子类别为空时，搜索出错 2018-02-09 18:12:53 +08:00
daiao 432ca22daa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 17:20:13 +08:00
daiao 3bd7b4b7aa Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 17:19:51 +08:00
caishi 06e17790b5 详情图片 2018-02-09 17:19:48 +08:00
daiao e5f576f5ae 数据首页赛选 2018-02-09 17:19:31 +08:00
caishi 69e8969215 不能对数据主类别进行删除操作 2018-02-09 17:13:56 +08:00
daiao 2633f7dbfb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 17:00:28 +08:00
daiao 2951166010 数据上线缺陷修复 2018-02-09 17:00:12 +08:00
caishi b9a7b47ca4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 16:37:00 +08:00
caishi 0f83e7712e 显示详情样式修改 2018-02-09 16:36:42 +08:00
daiao 7f8a612a01 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 16:26:52 +08:00
daiao 92b54b3bb6 上线缺陷修复 2018-02-09 16:26:44 +08:00
huang 4cae214990 数据顶部搜索局部刷新问题 2018-02-09 16:25:29 +08:00
huang 1a1acaff27 导航数据偶尔500问题 2018-02-09 16:08:52 +08:00
caishi 9c02de788d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 15:55:07 +08:00
caishi ce939c57a8 主类别 2018-02-09 15:54:49 +08:00
daiao 670f65d10c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 15:42:50 +08:00
daiao 2f59564a40 课程报500 2018-02-09 15:42:43 +08:00
huang 1b9cb4e508 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 15:19:30 +08:00
huang 205147cc5c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/statistics_controller.rb
 2018-02-09 15:19:17 +08:00
caishi 953d8de96f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/statistics/show.html.erb
 2018-02-09 15:17:03 +08:00
caishi 4d0336497d 编辑返回 2018-02-09 15:11:34 +08:00
huang b89b778872 修复附件编辑的时候偶尔不成功的问题 2018-02-09 15:03:28 +08:00
daiao 08433fba31 显示数据大小 2018-02-09 13:53:05 +08:00
daiao 9e64872470 附件权限控制 2018-02-09 11:30:43 +08:00
daiao 71e3ff3df6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 11:27:41 +08:00
daiao bc70b1a3e0 数据权限控制 2018-02-09 11:27:32 +08:00
caishi 92325f1107 详情显示 2018-02-09 11:09:16 +08:00
daiao 3c1bc10274 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/statistics/show.html.erb
 2018-02-09 11:06:35 +08:00
daiao 9da515a318 数据详情页面修改 2018-02-09 11:05:26 +08:00
caishi 818535492f 上传图片弹框样式 2018-02-09 11:04:41 +08:00
caishi 21db2d1f18 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/statistics/show.html.erb
 2018-02-09 10:57:21 +08:00
caishi a029f36808 样式 2018-02-09 10:56:40 +08:00
daiao 4477223637 editorMD上传图片 2018-02-09 10:55:26 +08:00
daiao 691b59d856 数据描述使用editorMD 2018-02-09 10:35:28 +08:00
caishi a54226a5e7 附件样式 2018-02-09 10:20:37 +08:00
caishi 04a0ef03ac 附件 2018-02-09 10:12:47 +08:00
caishi 85a0e0808c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 10:08:24 +08:00
caishi 1c2cff658f textarea 2018-02-09 10:07:44 +08:00
daiao 59849472ab 编辑关卡时，上传附件 2018-02-09 10:07:34 +08:00
daiao 6f134f5f28 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-09 09:55:32 +08:00
daiao 91dae5c4e9 数据页面赛选排序 2018-02-09 09:55:21 +08:00
caishi c8135e23c1 数据类别名称 2018-02-08 17:18:18 +08:00
daiao 1117805669 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-08 16:25:56 +08:00
daiao afe708eb86 数据首页筛选优化 2018-02-08 16:25:49 +08:00
huang 7f32f7f068 查询语句按attachments的size排序 2018-02-08 16:16:28 +08:00
daiao 75f9f867e8 新建数据使用editorMD 2018-02-08 16:05:29 +08:00
daiao 8bead9fecb 筛选问题 2018-02-08 15:37:30 +08:00
daiao d54020d32d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-08 15:12:46 +08:00
daiao 31a10a9945 数据首页分类完成 2018-02-08 15:12:36 +08:00
huang a7322ac90c 修复编辑在特殊情况下的一些问题 2018-02-08 15:10:53 +08:00
huang 462d910ece statistics编辑 2018-02-08 14:33:50 +08:00
huang 70894ace5e 新建statistics的一些问题修复 2018-02-08 11:31:31 +08:00
huang 2b73c4b338 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2018-02-08 11:25:00 +08:00
huang dc36435be5 编辑功能 2018-02-08 11:24:42 +08:00
daiao aed5823d3f 数据页面 2018-02-08 11:24:04 +08:00
huang cfb3b3184b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/statistics/_form.html.erb
 2018-02-08 10:30:05 +08:00
huang 89bc3c24ed 新建数据统计两级类型选择 2018-02-08 10:28:45 +08:00
caishi 2aa424f356 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/statistics/_form.html.erb
 2018-02-07 17:28:04 +08:00
caishi 4645bddd1c fdf 2018-02-07 17:26:09 +08:00
huang ae0e78664c 提交 2018-02-07 17:25:41 +08:00
huang 65e2433592 完成子类数据；主类数据功能 2018-02-07 16:19:16 +08:00
caishi 2bb713c7b9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2018-02-07 16:02:35 +08:00
caishi 9ed4637269 超级管理员新增编辑删除数据主类别和子类别 2018-02-07 16:02:04 +08:00
huang 405b362470 数据子类别与数据主类别的一些修改 2018-02-07 16:01:14 +08:00
huang a25dc9d6ce 数据子类（增删查改）；数据主类（增删查该） 2018-02-07 14:13:09 +08:00
caishi a38c68a791 数据新建和列表 2018-02-06 17:41:39 +08:00
huang 0db396175b 数据统计添加附件功能 2018-02-05 15:13:03 +08:00
huang 11dfd8dbb2 数据统计功能（增删查改） 2018-02-05 12:03:35 +08:00
cxt f9a507ec11 分组作业成绩导出 2018-01-11 09:35:29 +08:00
cxt 346d050736 分组作业成绩导出 2018-01-11 09:26:21 +08:00
huang a7c57c5b52 作业导入 2017-11-12 15:42:37 +08:00
huang 00e250f1b8 导入作业 2017-11-12 14:44:20 +08:00
huang 353b9ac670 excel导入功能 2017-11-12 11:30:00 +08:00
huang aadba839ae 添加代码在线编辑功能 2017-11-08 19:01:29 +08:00
daiao f607f72ce4 版本库编辑 2017-11-08 18:00:46 +08:00
cxt 14fd5eb113 作业评分 2017-11-08 16:14:12 +08:00
cxt a2908e84f4 codepedia 2017-11-06 15:00:54 +08:00
cxt 0375d86fa6 单位排序 2017-10-20 16:33:18 +08:00
cxt 21dadba5d9 测验的题干 2017-10-18 16:43:50 +08:00
cxt d5aeca28e5 质量分析页面调整 2017-10-18 16:12:33 +08:00
cxt 721792a849 测验的题干改成ke 2017-10-18 16:03:32 +08:00
cxt c04200804d 质量分析的修改 2017-10-17 10:05:10 +08:00
cxt ad05f75f03 实训项目的资源库加上开源检索跳到oscean 2017-10-14 15:04:04 +08:00
cxt 60445fcb3f 批量设置 2017-09-13 16:41:36 +08:00
cxt d5488ba806 班级资源的批量设置 2017-09-13 16:05:55 +08:00
cxt 9b51225c23 测验 2017-09-08 19:51:31 +08:00
cxt c1b912188b 资源的批量设置（未完成） 2017-09-08 17:07:00 +08:00
cxt f077204add 周丽涛老师反馈 2015年秋的大基课程中的在线测验查看不了题目内容 2017-09-08 16:09:13 +08:00
cxt 9c5b9aba50 班级无法导入改课程下已归档班级的问卷 2017-09-08 16:02:18 +08:00
cxt 478a88c09f 新建课程不能提交 2017-09-06 14:58:26 +08:00
cxt 5f5c59f516 批量设置按钮隐藏 2017-09-01 17:22:12 +08:00
cxt 841b180bea 班级资源的复制 2017-09-01 17:21:02 +08:00
cxt a8c166ae52 班级的通知模块增加“历史通知”的入口和显示 2017-08-31 09:46:55 +08:00
cxt 374827d3a4 新建班级继承了原有班级的资源，而发布者不能修改资源了 2017-08-14 15:36:19 +08:00
cxt f46da97b6d 用户头像上传后尺寸不对 2017-07-25 10:25:08 +08:00
cxt 80b8eab4e7 在线测验的答题统计若客观题或者主观题下没有题目，不应该显示列 2017-07-25 10:02:20 +08:00
cxt 2d19cac4f2 在线测验的答题情况，没有题的题型不需要显示 2017-07-25 09:26:45 +08:00
cxt 3f36453548 请将头像尺寸换成正方形 2017-07-25 09:10:27 +08:00
cxt 06eebec1c1 博客的调整 2017-07-14 13:50:31 +08:00
cxt ee6b10094c 评阅区默认显示本人上次给予的评分和评语 2017-07-03 14:32:14 +08:00
cxt 24b88fe326 班级资源模块的权限修改 2017-06-14 09:42:05 +08:00
cxt 858150b3f9 资源下载 2017-06-10 09:28:53 +08:00
cxt 11b06012e2 班级资源库共享课程资源，但是搜索没有同步 2017-06-08 15:42:14 +08:00
cxt 28c5e9dfcc 发布问卷的消息通知放delay_job 2017-06-08 11:03:58 +08:00
cxt fb810a1993 班级的资源，请显示课程下所有班级的资源 2017-06-08 10:38:37 +08:00
cxt cba4929179 提交后也可以修改问卷 2017-05-18 16:54:02 +08:00
cxt b9311bef94 在班级的讨论区列表增加“历史讨论”入口 2017-05-12 09:56:04 +08:00
cxt 552b571762 评分设置：提供两种机制由用户选择 2017-04-25 17:13:33 +08:00
cxt 35a60d5c31 启用/禁用匿评时评分设置的调整 2017-04-25 10:53:28 +08:00
cxt fd7300bcaf 作业消息的发布 2017-04-19 17:53:45 +08:00
cxt 97e9fb5444 班级统计列表数据不对 2017-04-19 17:35:03 +08:00
cxt 56e67fa0c0 班级作业在匿评中无法看到匿评设置选项 2017-04-18 09:59:13 +08:00
cxt 7b2d9491b3 恢复问卷中的多行主观题 2017-04-17 11:01:11 +08:00
cxt 80a53d8120 删除历史资源后再删除所有资源不翻页 2017-04-14 19:15:25 +08:00
cxt e20b3f84f6 删除班级资源后刷新停留在当前页 2017-04-14 18:13:05 +08:00
cxt 70aae10370 班级资源的删除刷新 2017-04-10 11:01:53 +08:00
cxt 1f515d4ec5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-04-07 16:52:00 +08:00
cxt 3cdf8c8a57 组员同评时组员的评分消息不应为“重新评阅” 2017-04-07 16:51:50 +08:00
cxt 3e286f8ac3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-04-07 15:35:59 +08:00
cxt a5a99e7bcf 删除分组作品时相关记录未删完全 2017-04-07 15:33:24 +08:00
cxt bc352897ef 班级作业“从题库引用”作业，有时如图作业描述框中会出现一大片空白 2017-04-06 15:19:24 +08:00
cxt efe9e643ad 获取用户学校时增加判断 2017-04-05 14:43:51 +08:00
陈晓婷 8aaa3e5767 Merge branch 'develop' into 'develop' 
邮箱激活留言默认收起



See merge request !180
 2017-04-01 15:21:52 +08:00
daiao cecca1a67a 未激留言默认收起 2017-04-01 15:15:41 +08:00
cxt e7f2461ca6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-31 15:10:45 +08:00
cxt 6f5a2bb494 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-31 15:09:46 +08:00
cxt f6c38be83f 竞赛说明中为非汉字类型，且长度够长，如图显示超出边框 2017-03-31 15:08:55 +08:00
陈晓婷 66ec140eed Merge branch 'develop' into 'develop' 
trustie版



See merge request !178
 2017-03-31 15:01:00 +08:00
cxt f3057fc9c8 先对课程下的班级归档，再删除该课程，此时就不能再恢复班级了 2017-03-31 15:00:09 +08:00
cxt 1dcaef2ce7 编程作业的字符集问题 2017-03-31 14:25:54 +08:00
cxt 161990a3de 老师所在班级，助教新建的题，无法加到老师的题库 2017-03-30 17:27:33 +08:00
cxt 2a7a8fcdb4 班级作业的最终得分设置修改，由用户决定教师、助教和匿评的百分比计算 2017-03-30 15:31:07 +08:00
huang 8f8fc6200c 申请高校消息500问题 2017-03-29 09:34:39 +08:00
huang 309cd06009 500问题 2017-03-29 09:29:25 +08:00
huang afbe8267ae Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-29 09:22:36 +08:00
huang e55ccb9e91 修复测试版500问题 2017-03-29 09:19:43 +08:00
daiao c5826a04a2 激活提示页的更换邮箱，点击确定后应该马上给新的邮箱地址发送激活邮件 2017-03-27 15:07:49 +08:00
daiao b213cd7546 注册激活邮箱提示页与未激活永辉登录提示页的留言默认收起 2017-03-27 14:47:54 +08:00
cxt 6ca6713a64 excel导出的作品提交时间都是相同的 2017-03-27 14:20:09 +08:00
cxt 733dd0d9d2 班级作业的匿评设置在火狐和IE浏览器上不能正常使用 2017-03-27 14:12:53 +08:00
cxt e5e5ad2b40 发布测验报500 2017-03-24 20:57:55 +08:00
cxt 69690d57a4 班级测验发布时发送消息通知 2017-03-24 20:45:11 +08:00