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

1378 Commits

Author SHA1 Message Date
caishi 1067d596d9 Merge branch 'dev_toschina' of https://git.trustie.net/jacknudt/trustieforge into dev_toschina 
Conflicts:
	db/schema.rb
 2018-11-22 15:46:15 +08:00
caishi ac1d3e8bf6 oschina登录--授权页 2018-11-22 15:45:22 +08:00
guange 5c2565f236 表更改 2018-11-22 15:30:25 +08:00
guange ecbdfcf1ed 表更改 2018-11-22 15:29:17 +08:00
guange 77d2f3ac17 oauth生成token 2018-11-22 14:55:06 +08:00
guange 075fd9670f 添加oauth接口 2018-11-22 10:50:48 +08:00
guange 317e940fb0 oschina登录同步 2018-11-21 14:41:44 +08:00
cxt d894a925c9 trustie作业评分优化 2018-07-02 11:08:40 +08:00
daiao 8b8f581219 里程碑未完成工时统计 2018-06-25 14:21:54 +08:00
huang 311f8855f4 存储output结果 2018-06-10 21:35:39 +08:00
huang ca8952581a 项目添加语言配置/Jenkins分析和Merge Request关联 2018-06-08 17:00:10 +08:00
huang dc41da89c4 针对某些项目进行测试 2018-06-07 17:14:53 +08:00
cxt 075091beda 数据增加数据源大小 2018-05-04 17:17:07 +08:00
cxt 46df3c2d67 班级相关页面的优化 2018-03-23 15:54:50 +08:00
daiao 2951166010 数据上线缺陷修复 2018-02-09 17:00:12 +08:00
huang 8e786b2f19 gem 2018-02-09 15:38:18 +08:00
caishi c8135e23c1 数据类别名称 2018-02-08 17:18:18 +08:00
huang 7f32f7f068 查询语句按attachments的size排序 2018-02-08 16:16:28 +08:00
daiao aed5823d3f 数据页面 2018-02-08 11:24:04 +08:00
caishi 4645bddd1c fdf 2018-02-07 17:26:09 +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
caishi 617970ddd2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2018-02-07 14:16:11 +08:00
caishi fb5e59093a x 2018-02-07 14:14:31 +08:00
huang a25dc9d6ce 数据子类（增删查改）；数据主类（增删查该） 2018-02-07 14:13:09 +08:00
huang 11dfd8dbb2 数据统计功能（增删查改） 2018-02-05 12:03:35 +08:00
cxt 841b180bea 班级资源的复制 2017-09-01 17:21:02 +08:00
cxt 1193c4b145 问卷的多行主观题迁移 2017-05-22 10:14:04 +08:00
cxt 552b571762 评分设置：提供两种机制由用户选择 2017-04-25 17:13:33 +08:00
cxt 97e9fb5444 班级统计列表数据不对 2017-04-19 17:35:03 +08:00
cxt 2a7a8fcdb4 班级作业的最终得分设置修改，由用户决定教师、助教和匿评的百分比计算 2017-03-30 15:31:07 +08:00
guange 606e431396 集成云片的短信发送功能 2017-03-12 16:53:47 +08:00
cxt 42ab249651 小铃铛的数字标识和事情情况有冲突 2017-03-09 10:58:46 +08:00
cxt 7de40ac88b 用户反馈（微信群）-评分作品被修改的提醒 2017-03-08 09:54:15 +08:00
cxt 95595c6fe6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2017-03-03 15:37:55 +08:00
cxt 96312c6dfa Merge branch 'cxt_course' into develop 2017-03-03 14:45:30 +08:00
cxt 4688fbaec9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-03 14:45:17 +08:00
cxt f30507b6f0 在线测验改版 2017-03-03 14:43:51 +08:00
daiao 90f0dc47b8 超级管理员的待审批申请中，更改申请高校名称后，依然在待审批消息中显示 2017-03-03 11:13:00 +08:00
huang 7763ce0d66 添加数据 2017-02-28 21:56:39 +08:00
cxt baabce13b2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	db/schema.rb
	public/stylesheets/css/common.css
	public/stylesheets/css/courses.css
 2017-02-28 10:15:33 +08:00
cxt 524dd85409 班级新建作业，加入题库时，没有将附件一起加入 2017-02-28 10:11:58 +08:00
cxt e658a5426d 班级作业加入题库，题库中该作业的引用数是零 2017-02-24 17:18:32 +08:00
cxt 099fcde246 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2017-02-24 15:20:34 +08:00
cxt 0e40bf6daf 题库改版 2017-02-24 10:32:48 +08:00
Linda e1be2fda81 实训任务提交测评显示状态增加样式 2017-02-23 10:25:55 +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
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