Commit Graph

2271 Commits

Author SHA1 Message Date
huang 33b8a1d101 pull request分析中添加jenkins执行过程 2018-06-10 20:41:21 +08:00
huang c080cf6c94 pull request添加jenkins执行过程结果 2018-06-10 20:31:42 +08:00
huang edd777aacc pull request的时候启动jenkins尺寸集成sonar分析 2018-06-07 16:39:09 +08:00
cxt 927158fbae 北大数据的导入 2018-06-05 14:58:45 +08:00
cxt 75349207a0 数据的新建和编辑的调整 2018-05-09 15:57:30 +08:00
cxt 2ea79057c9 课程下创建新班级,提供可选项选择是否继承原有资源等实现方法 2018-03-16 16:08:39 +08:00
daiao 4477223637 editorMD上传图片 2018-02-09 10:55:26 +08:00
huang 405b362470 数据子类别与数据主类别的一些修改 2018-02-07 16:01:14 +08:00
huang a25dc9d6ce 数据子类(增删查改);数据主类(增删查该) 2018-02-07 14:13:09 +08:00
huang 11dfd8dbb2 数据统计功能(增删查改) 2018-02-05 12:03:35 +08:00
cxt 55fd9e6adb footer修改 2018-01-09 09:39:55 +08:00
cxt ba9ce24735 footer修改 2018-01-08 13:49:51 +08:00
huang 353b9ac670 excel导入功能 2017-11-12 11:30:00 +08:00
huang aadba839ae 添加代码在线编辑功能 2017-11-08 19:01:29 +08:00
cxt a2908e84f4 codepedia 2017-11-06 15:00:54 +08:00
cxt d5488ba806 班级资源的批量设置 2017-09-13 16:05:55 +08:00
cxt 841b180bea 班级资源的复制 2017-09-01 17:21:02 +08:00
cxt a8c166ae52 班级的通知模块增加“历史通知”的入口和显示 2017-08-31 09:46:55 +08:00
cxt 06eebec1c1 博客的调整 2017-07-14 13:50:31 +08:00
cxt b9311bef94 在班级的讨论区列表增加“历史讨论”入口 2017-05-12 09:56:04 +08:00
cxt f520d641ab 更新设置了延期发布的班级资源时,延期发布设置会丢失,且没有提醒 2017-03-17 13:55:21 +08:00
daiao a9fb270b54 问吧的帖子,吧主和超级管理员有置顶权限 2017-03-09 16:42:30 +08:00
cxt 96312c6dfa Merge branch 'cxt_course' into develop 2017-03-03 14:45:30 +08:00
cxt f30507b6f0 在线测验改版 2017-03-03 14:43:51 +08:00
daiao 20cc376246 注册激活页面的更换邮箱,更换一次之后,第二次弹框显示的原邮箱不正确 2017-03-01 15:51:12 +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
huang 9a3793ffa9 完成training_task 编辑功能 2017-02-23 10:45:28 +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 b08a8e8050 Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining 2017-02-22 15:52:05 +08:00
huang 96aa9b7261 实训项目一些调整,api和结构 2017-02-22 08:54:38 +08:00
daiao 4a925201eb 实训任务增加二级回复功能 2017-02-21 17:23:44 +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 f59243ab9f 实训api改进及一些提醒 2017-02-21 14:34:17 +08:00
huang 8d1987567e 实训项目相关模块相关api的开发 2017-02-19 17:49:58 +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 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
huang a43c5cdb2f 启动实训Api等 2017-02-18 17:44:50 +08:00
huang d4eb4c0d56 实训任务模块 2017-02-17 19:29:00 +08:00
cxt b81d9b86c4 班级的配置页面,管理员增加“更换管理员”功能 2017-02-17 15:00:14 +08:00
daiao 3e705fabb8 平台底部调整(去除底部图片,增加合作伙伴一栏) 2017-02-09 10:47:18 +08:00
guange 99741daef5 merge 2017-01-20 14:00:22 +08:00
guange d9ba7896df merge 2017-01-20 13:57:50 +08:00
cxt 65bfaedb3a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	db/schema.rb
2017-01-20 13:56:34 +08:00
cxt ac80805932 班级统计功能(暂未完成) 2017-01-20 10:16:51 +08:00
daiao 6619ee9c20 开源检索功能 2017-01-20 09:52:10 +08:00
daiao a2aea42868 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-19 15:57:55 +08:00