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

15244 Commits

Author SHA1 Message Date
cxt 3e3ad381b1 竞赛：改了提交截止日期，显示的还是提交已截止 2017-02-24 14:29:41 +08:00
huang 6e96f6e9ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-24 13:52:18 +08:00
huang d76e34889a task不重复执行 2017-02-24 13:42:58 +08:00
huang 30c14c2e07 任务启动回调逻辑控制 2017-02-24 12:30:36 +08:00
cxt 0e40bf6daf 题库改版 2017-02-24 10:32:48 +08:00
huang 6e9ef8ee12 Merge branch 'develop' into dev_raining 
Conflicts:
	app/controllers/repositories_controller.rb
	app/views/layouts/_base_project_top.html.erb
 2017-02-24 10:26:22 +08:00
huang 38e6b098c3 回复为0不显示 2017-02-24 10:01:08 +08:00
huang bd2d0d3869 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 
Conflicts:
	app/views/training_tasks/_content_list.html.erb
 2017-02-24 09:58:52 +08:00
daiao c76db2cb24 项目问题动态回复功能修复 2017-02-24 09:56:58 +08:00
daiao 9e7ce0fd6a 实训任务样式调整 2017-02-24 09:41:15 +08:00
huang 658023cbe0 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-24 09:04:07 +08:00
daiao 4885ec5afb Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 17:26:35 +08:00
daiao 9697a9b5c1 实训项目展开/收起回复加载KE 2017-02-23 17:26:22 +08:00
huang 7074cbdba6 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 17:24:12 +08:00
huang 019ce762f8 针对实训子项目，一些权限修改 2017-02-23 17:23:52 +08:00
Linda 2fb75fdb4d Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 17:14:32 +08:00
Linda b369b9c281 实训任务标题样式修改 2017-02-23 17:13:56 +08:00
daiao 75f1fc964a 实训任务项目动态展开更多与收起回复功能 2017-02-23 17:09:22 +08:00
huang 705f94428e Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 16:18:16 +08:00
huang 49f63992d8 任务开启的时候权限控制 2017-02-23 16:17:37 +08:00
daiao f817aef5d2 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 16:13:16 +08:00
daiao 1e56a69eed 动态消息的实训动态添加回复/二级回复功能 2017-02-23 16:12:29 +08:00
Linda 95f06e50ff 实训任务动态标题样式修改 2017-02-23 16:01:23 +08:00
huang 6bd160d642 样式问题 2017-02-23 15:46:07 +08:00
huang 0e48262407 动态中提交评测ajax局部刷新 2017-02-23 15:27:10 +08:00
huang 6f06fde7dc Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 14:13:47 +08:00
huang 727a6fd536 实训项目一些封装 2017-02-23 14:13:25 +08:00
daiao 31d852cd60 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 13:40:07 +08:00
daiao 6d14cb131a 问吧右下角贴吧排序按照帖子发布数和回帖数之和排序 2017-02-23 13:39:44 +08:00
huang 384ae2764a Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 10:45:50 +08:00
huang 9a3793ffa9 完成training_task 编辑功能 2017-02-23 10:45:28 +08:00
daiao b36c249a6b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 10:29:21 +08:00
Linda e1be2fda81 实训任务提交测评显示状态增加样式 2017-02-23 10:25:55 +08:00
daiao 7e04e67a5b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 10:10:59 +08:00
daiao 8bd9fc81d6 账号未激活提示页提交留言机制修改（从发送到管理员留言改到贴吧） 2017-02-23 10:09:56 +08:00
huang 04edefac8b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 09:47:39 +08:00
huang ac77c26c50 task写入项目动态中 2017-02-23 09:47:15 +08:00
daiao 8d51e896fa Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-23 09:32:36 +08:00
daiao fa7b15db47 注册成功提示页与账号未激活提示页，增加‘更换邮箱的功能’ 2017-02-23 09:32:13 +08:00
huang 006608dca8 修改参数名 2017-02-22 16:30:16 +08:00
huang b08a8e8050 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-22 15:52:05 +08:00
huang eeba0c362d 实训项目一些ajax控制 2017-02-22 15:49:37 +08:00
huang 3f105cefe7 版本库访问权限控制清理 2017-02-22 12:33:45 +08:00
cxt da4aaca1ea 消息首页报500 2017-02-22 12:26:56 +08:00
daiao 807129aeff 项目实训任务二级回复样式调整 2017-02-22 10:55:24 +08:00
黄井泉 7f7491c670 Merge branch 'develop' into 'develop' 
部分项目切换分支500问题



See merge request !154
 2017-02-22 10:46:42 +08:00
cxt f41341a3d4 班级成员列表报500 2017-02-22 10:35:33 +08:00
huang 0629b31e53 解决部分项目（比如：594）切换版本库分支500问题 2017-02-22 10:14:04 +08:00
daiao 06306e0214 实训项目叠层回复功能 2017-02-22 10:08:05 +08:00
cxt 422b5ffa95 首页申请加入竞赛的消息报500 2017-02-22 10:01:54 +08:00
huang 0070bed92b 项目质量分析结果列表样式异常问题 2017-02-22 09:35:11 +08:00
huang 96aa9b7261 实训项目一些调整，api和结构 2017-02-22 08:54:38 +08:00
daiao 4a925201eb 实训任务增加二级回复功能 2017-02-21 17:23:44 +08:00
daiao 41197af763 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-21 16:24:58 +08:00
daiao 43c990c0a9 二级回复功能（回复未刷新） 2017-02-21 16:24:30 +08:00
Linda 81ac923e3b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-21 14:57:49 +08:00
Linda 7451838509 syllablus.css和sy.public.css简化转移到 css文件夹；修改页面中引用这两个样式的路径 2017-02-21 14:51:48 +08:00
huang e6deabadba 后台作业列表添加编程作业过滤 2017-02-21 14:45:18 +08:00
daiao 818d7ad2ef Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-21 14:38:32 +08:00
daiao 544432adce 实训任务详情页面的一级回复功能 2017-02-21 14:38:05 +08:00
huang f7e59c782c Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-21 14:34:40 +08:00
huang f59243ab9f 实训api改进及一些提醒 2017-02-21 14:34:17 +08:00
daiao e4b582fbb7 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-20 15:19:44 +08:00
daiao aacac21110 实训任务详情页面 2017-02-20 15:19:24 +08:00
huang d21350b754 tpi先建任务权限判断 2017-02-20 14:39:39 +08:00
huang 32f14e957d Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-20 14:23:25 +08:00
huang 8063932500 fork项目的时候一并forkmodule 2017-02-20 14:23:02 +08:00
daiao c115fad8a1 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 
Conflicts:
	db/schema.rb
 2017-02-20 14:09:59 +08:00
daiao 8039f89d92 实训项目的列表页面 2017-02-20 14:08:48 +08:00
huang 336c28ccdb 实训项目权限控制 2017-02-20 12:33:27 +08:00
Linda 1fb79f717c 留言界面，留言与留言直接间隔修改 2017-02-20 11:27:18 +08:00
Linda 54eb9b0bca 网站底部版权信息居中 2017-02-20 10:48:36 +08:00
Linda 72f085e13e Merge branch 'develop' into dev_raining 
Conflicts:
	db/migrate/20170219062646_add_positon_to_training_task.rb
	db/schema.rb
 2017-02-20 10:15:47 +08:00
huang e5cfc7280b Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-19 17:50:17 +08:00
huang 8d1987567e 实训项目相关模块相关api的开发 2017-02-19 17:49:58 +08:00
Linda dae19d7be6 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/projects/settings/_new_modules.html.erb
 2017-02-19 15:30:38 +08:00
Linda 89dc320027 合作伙伴图片 及项目管理脚本录入界面 2017-02-19 15:28:57 +08:00
daiao 2aa025cf32 实训项目新建页面样式调整 2017-02-19 15:17:46 +08:00
daiao 0bce2f25b4 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-19 14:40:48 +08:00
huang 82c6799953 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 
Conflicts:
	db/schema.rb
 2017-02-19 14:40:27 +08:00
huang df66e6d60c 启动任务相关接口 2017-02-19 14:39:15 +08:00
daiao 568bc4e6b7 项目配置-模块页面加入提示 2017-02-19 11:24:43 +08:00
daiao 243062bee2 实训项目module中“实训项目”和"issue”不能同时选中，只选中一个 2017-02-19 10:50:08 +08:00
daiao 77f58d76a5 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into develop 
# Conflicts:
#	db/schema.rb
 2017-02-19 09:21:55 +08:00
cxt c3cd2ea153 班级的编程作业在新建和编辑时，需要增加输入输出样例的录入入口 2017-02-18 18:00:52 +08:00
huang a43c5cdb2f 启动实训Api等 2017-02-18 17:44:50 +08:00
cxt 9ef33daa39 学生列表各积分标题的tip请统一放在右侧提示区（参照班级邀请码tip） 2017-02-18 15:07:48 +08:00
cxt 9c3e7ab595 班级配置页面的底部留白不要太多 2017-02-18 14:14:54 +08:00
huang d4eb4c0d56 实训任务模块 2017-02-17 19:29:00 +08:00
cxt 78614e18ca 添加学生报错 2017-02-17 19:01:53 +08:00
cxt c6ae00c6be 作品列表出现重复的数据 2017-02-17 18:54:15 +08:00
cxt de7b29c260 从课程界面进入的新建班级页面，班级名称未自动添加上课程名称 2017-02-17 16:33:01 +08:00
cxt 24f766d0a5 更换管理员发送微信模板消息 2017-02-17 16:19:49 +08:00
cxt c1301bbd7d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-17 15:02:24 +08:00
cxt b81d9b86c4 班级的配置页面，管理员增加“更换管理员”功能 2017-02-17 15:00:14 +08:00
cxt 49c6b3be12 导入的在线测验，进入编辑页面，没有填写日期信息，也成功提交了 2017-02-17 10:32:27 +08:00
daiao 3cad78a991 增加合作伙伴的显示 2017-02-17 10:09:10 +08:00
cxt aefd4973c2 在线测验的新建、编辑改版 2017-02-17 09:03:43 +08:00
daiao 2c42a51195 平台管理员的首页报500 2017-02-17 09:00:35 +08:00
daiao cb5548c853 博客回复发送的消息，点击之后没有自动更新为已读 2017-02-16 15:18:35 +08:00
daiao 0d1738cf91 我收到的issue，标题没有居中显示，有错位 2017-02-16 14:54:56 +08:00
daiao 9af54a9288 我发布的issue列表，标题没有居中对齐，视觉上有错位 2017-02-16 14:09:15 +08:00
cxt c16f63a8b4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	db/schema.rb
	public/stylesheets/css/courses.css
 2017-02-15 11:15:09 +08:00
cxt 9be2cb56a1 Revert "Revert "测验头部和新建题目的改版"" 
This reverts commit 5a6e64beb2.

Conflicts:
	db/schema.rb
	public/stylesheets/css/courses.css
 2017-02-15 11:12:10 +08:00
daiao 2cad08614f 系统发出的加入班级\项目\竞赛消息通知,点击后自动变为已读（并优化消息代码结构） 2017-02-15 10:54:09 +08:00
daiao 1f2fadc9f6 消息结构优化 2017-02-15 10:03:09 +08:00
cxt 11eba7637f 班级头部信息展示由三行更新成两行 2017-02-14 16:29:28 +08:00
cxt 10b7063791 新建班级选择课程后，在班级名称中自动带入课程名称，减少用户输入 2017-02-14 15:22:12 +08:00
cxt 89eab427aa 班级统计中的项目活跃度增加按作业过滤 2017-02-14 15:07:38 +08:00
daiao bc0be4c890 项目社区首页的左侧导航栏，样式问题 2017-02-14 10:03:38 +08:00
daiao 603d5d5703 底部导航的版权限制中，空格太大 2017-02-14 09:59:06 +08:00
daiao 7c0042b70d 个人主页列表变成粗体了 2017-02-14 09:15:58 +08:00
cxt 649f87a43f 班级左侧导航栏的活跃度和英雄榜链接错误 2017-02-13 16:02:11 +08:00
cxt 4a04d1c271 作业，资源，问卷，在线测验模块没有数据显示时，显示笑脸图片 2017-02-13 15:58:33 +08:00
cxt 52834f4b21 作业评分设置弹框，如图弹框不能移动导致显示不全 2017-02-13 14:49:06 +08:00
cxt 8756bd7061 一个学生的匿评申诉被接受一次，但是违规匿评扣分却扣了两次、 
匿评申诉被处理后，无论是申诉人还是被申诉人，都收到了2条一样的消息通知
 2017-02-13 14:34:14 +08:00
cxt 4cd573efe6 匿评申诉为被处理时，仅申诉人看到的界面显示少了分隔线（其它用户的界面显示正常） 2017-02-13 14:12:46 +08:00
daiao 6ea90fb74f 项目里程碑，pullrequest样式调整（tab下样式边窄了） 2017-02-13 13:54:13 +08:00
cxt 4930e36503 匿评申诉的弹框显示，标题位置错误 2017-02-13 11:00:33 +08:00
cxt c3b237af67 学生匿评：第一次匿评，分数都不能自动刷新 2017-02-10 17:57:30 +08:00
cxt c0de119969 班级统计活跃度中“班级留言”统计错误 2017-02-10 17:36:23 +08:00
cxt bd8e86b34b 未登录用户不可在班级留言 2017-02-10 17:23:07 +08:00
cxt f844e44675 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-10 17:13:02 +08:00
cxt 12cb1c3a0f 题库中编程作业的测试集显示未换行 2017-02-10 17:09:51 +08:00
cxt 6ccc53b089 班级统计中“活跃度”未完全统计 2017-02-10 17:04:10 +08:00
cxt 18ea262f34 班级配置-添加成员-角色编辑：将角色编辑为教师或助教单个角色时，点击保存无反应 2017-02-10 16:11:33 +08:00
daiao 271cb31f18 上线测试版缺陷修复 2017-02-10 16:01:55 +08:00
cxt 650eb963b4 编程作业：当测试集个数超过10个时，如图样式问题 2017-02-10 15:57:38 +08:00
cxt 888531f7c2 首页访问“待匿评作品”中如下作业报500 2017-02-10 15:41:26 +08:00
daiao 01595fda4a 上线测试版缺陷修复 2017-02-10 15:30:18 +08:00
cxt 8078bc9c15 项目活跃度的弹框 2017-02-10 15:14:53 +08:00
cxt 4a0310f88c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/public.css
 2017-02-10 14:37:28 +08:00
cxt e4ebd4dd2c 班级的统计模块显示“活跃度”、“英雄榜”、“项目活跃度”(单个作业的过滤未完成) 2017-02-10 14:35:43 +08:00
daiao eb5ee64825 对于隐藏版本库的项目，版本库对报告人员不可见 2017-02-10 11:13:02 +08:00
daiao c0508fcfbe ID为2528的项目描述显示有问题 2017-02-09 11:05:51 +08:00
daiao 3e705fabb8 平台底部调整（去除底部图片，增加合作伙伴一栏） 2017-02-09 10:47:18 +08:00
cxt 61d6a6a7c3 竞赛基本信息页面的“竞赛介绍”的默认提示信息丢失了 2017-02-09 09:45:46 +08:00
daiao b9cb857025 问吧首页点击“我要提问”，显示的页面有点不合适 2017-02-08 14:21:45 +08:00
cxt 18ff7deca2 超级管理员恢复竞赛要有类似于恢复成功的提示 2017-02-08 14:16:40 +08:00
cxt 0b510df8b1 班级资源的延期发布精确到小时、班级、项目资源上传弹框改版 2017-02-08 13:54:04 +08:00
daiao eb5f5f9ede 资源库：上传资源弹框使用新样式 2017-02-08 13:42:53 +08:00
daiao 574f491b56 Issue新建页面的指派者，按照姓名排序 2017-02-07 15:15:10 +08:00
daiao ccab457f0f 首页重构，我的Issue分离2个独立页（分离项目和课程）-缺陷的第二点 2017-02-07 11:17:07 +08:00
daiao 6fa813eea6 项目里程碑，如图若无权限新建里程碑，就不要显示新建里程碑入口，点击又无反应，影响体验 2017-02-07 10:40:09 +08:00
cxt f0a94302a0 编程作业答题时，测试集很长的显示默认收起，点击才展开 2017-02-07 10:35:21 +08:00
cxt 0b44fbebd9 首页的待办任务“待匿评作品”显示不正确 2017-02-06 13:50:48 +08:00
cxt 756774f6ba Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-02-06 11:18:52 +08:00
cxt 47c634cc99 学生的试卷列表，无需显示“已发布”标识，因为没有发布的试卷，学生是看不到的 2017-02-06 11:18:34 +08:00
黄井泉 ea104b2941 Merge branch 'develop' into 'develop' 
我收到的issue导出excel名称修改



See merge request !142
 2017-01-20 20:42:02 +08:00
daiao d0f7bf9e97 我收到的issue和我发布的issue导出excel统一 2017-01-20 20:40:31 +08:00