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

1142 Commits

Author SHA1 Message Date
huang 2326e25dba 开启实训前的一些提示 2017-03-24 10:15:49 +08:00
huang 622b7a4979 TPI开启任务模块 2017-03-08 14:59:40 +08:00
huang 3742757ae6 shixun job create 2017-03-07 18:19:50 +08:00
cxt f30507b6f0 在线测验改版 2017-03-03 14:43:51 +08:00
huang 9a3793ffa9 完成training_task 编辑功能 2017-02-23 10:45:28 +08:00
daiao fa7b15db47 注册成功提示页与账号未激活提示页，增加‘更换邮箱的功能’ 2017-02-23 09:32:13 +08:00
huang a43c5cdb2f 启动实训Api等 2017-02-18 17:44:50 +08:00
huang d4eb4c0d56 实训任务模块 2017-02-17 19:29:00 +08:00
daiao 3e705fabb8 平台底部调整（去除底部图片，增加合作伙伴一栏） 2017-02-09 10:47:18 +08:00
cxt ee4d676f11 竞赛提交增加作品成绩的导出 2017-01-12 11:14:27 +08:00
cxt 231fa56c49 管理员界面增加竞赛列表 2017-01-11 16:45:41 +08:00
daiao 03c9ca43ec 新建项目页与项目的配置页，将“项目描述”更新为“项目简介” 2017-01-05 14:42:19 +08:00
huang b9eb320d17 用户注册激活、token值过期添加提示 2017-01-03 15:20:31 +08:00
huang a6b4ec64e2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/memos_controller.rb
 2016-12-30 21:17:56 +08:00
daiao fbfbc0cdeb 问吧样式调整 2016-12-30 21:05:14 +08:00
huang 1ece9cb185 说明文字修改 2016-12-30 20:03:24 +08:00
huang 17d4e45acc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-12-30 17:33:18 +08:00
huang baaaaf95d8 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 
Conflicts:
	config/routes.rb
 2016-12-30 16:51:23 +08:00
cxt 986fe7db86 竞赛增加讨论区模块 2016-12-30 16:37:20 +08:00
huang 8126353b43 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_news_replies.html.erb
 2016-12-27 12:29:43 +08:00
huang 40c3d34a58 注册邮件内容后台可配 2016-12-26 15:40:43 +08:00
cxt e22e1caaed bug修复 2016-12-24 18:48:50 +08:00
cxt 9af9945cb4 竞赛 2016-12-24 16:29:10 +08:00
cxt 5242e12373 竞赛框架搭建 2016-12-22 10:01:37 +08:00
cxt a67d809168 在导出的Excel中，如果用户填写了其它，则应该在下方的列表中记录“其它（我录入的其它回复）” 2016-12-16 17:27:24 +08:00
huang 5527adb795 版本406异常处理，pull request 冲突接受后406异常提醒 2016-12-15 17:03:59 +08:00
huang 6d14353ef7 commit_diff 2016-11-28 15:25:26 +08:00
huang 21b13e33ce pull request的时候各种异常类型打印 2016-11-25 19:05:37 +08:00
huang 30a0347cd6 项目头部修改，及其成员列表，关注列表新版样式（未完） 2016-11-24 17:40:33 +08:00
daiao ffe86c7ec9 项目配置删除按钮新版弹框 2016-11-15 13:21:27 +08:00
huang fb2f1b3859 点击导出添加提醒 2016-11-03 15:42:40 +08:00
huang ef43488861 admin添加导出用户所有代码提交量 2016-11-03 15:35:09 +08:00
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-28 15:57:53 +08:00
huang 03b8d081ce 一些细节的修改 2016-10-28 09:43:30 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop 
Conflicts:
	db/schema.rb
 2016-10-27 17:33:28 +08:00
Tim c58fb36f44 在线测验单选、多选、填空题显示调整 2016-10-27 14:31:14 +08:00
huang 5c31a5379e 里程碑添加删除功能 2016-10-26 18:39:14 +08:00
daiao e3f0f222e6 新版Issue新建页面 2016-10-25 09:28:09 +08:00
yuanke bb5d957ec5 Merge branch 'cxt_course' into develop 2016-10-21 17:46:29 +08:00
cxt 3d29eb2be0 分班批量添加学生、小班页面 2016-10-21 17:34:02 +08:00
huang 6481978def Merge branch 'rep_quality' into develop 2016-10-21 14:20:32 +08:00
cxt dff47b586e 主页宽度调整、主页配置菜单调整 2016-10-20 09:26:01 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-19 18:11:02 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
huang cff887a2be 删除项目的时候删除版本库功能 2016-10-19 11:23:15 +08:00
daiao 32c5d7a13b Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-18 15:19:34 +08:00
daiao bdbd2e9cf7 项目配置组织与里程碑界面 2016-10-18 15:17:36 +08:00
huang fce6c407c8 Merge branch 'rep_quality' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/layouts/base_projects.html.erb
	app/views/projects/settings/_new_edit.html.erb
	public/stylesheets/css/project.css
 2016-10-19 11:27:49 +08:00
cxt 8648ea605f 问卷导出的统计结果：“其他”选项要标出来，多行主观题要对各小题标识出来 2016-10-18 11:14:29 +08:00
huang 5532ec3b86 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	app/views/layouts/base_projects.html.erb
	public/stylesheets/css/project.css
 2016-10-15 10:53:01 +08:00