Commit Graph

1916 Commits

Author SHA1 Message Date
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 3e3ad381b1 竞赛:改了提交截止日期,显示的还是提交已截止 2017-02-24 14:29:41 +08:00
cxt 0e40bf6daf 题库改版 2017-02-24 10:32:48 +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
daiao 06306e0214 实训项目叠层回复功能 2017-02-22 10:08:05 +08:00
huang 96aa9b7261 实训项目一些调整,api和结构 2017-02-22 08:54:38 +08:00
daiao 544432adce 实训任务详情页面的一级回复功能 2017-02-21 14:38:05 +08:00
huang 336c28ccdb 实训项目权限控制 2017-02-20 12:33:27 +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 d4eb4c0d56 实训任务模块 2017-02-17 19:29:00 +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
daiao cb5548c853 博客回复发送的消息,点击之后没有自动更新为已读 2017-02-16 15:18:35 +08:00
daiao 2cad08614f 系统发出的加入班级\项目\竞赛消息通知,点击后自动变为已读(并优化消息代码结构) 2017-02-15 10:54:09 +08:00
daiao 1f2fadc9f6 消息结构优化 2017-02-15 10:03:09 +08:00
cxt 89eab427aa 班级统计中的项目活跃度增加按作业过滤 2017-02-14 15:07:38 +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 3e705fabb8 平台底部调整(去除底部图片,增加合作伙伴一栏) 2017-02-09 10:47:18 +08:00
daiao 574f491b56 Issue新建页面的指派者,按照姓名排序 2017-02-07 15:15:10 +08:00
daiao 6fa813eea6 项目里程碑,如图若无权限新建里程碑,就不要显示新建里程碑入口,点击又无反应,影响体验 2017-02-07 10:40:09 +08:00
cxt 0b44fbebd9 首页的待办任务“待匿评作品”显示不正确 2017-02-06 13:50:48 +08:00
cxt 8c80573fef 如图“我收到的作业”页面中,“查看详情”感觉不合理,且点击查看详情却报404 2017-01-20 16:30:07 +08:00
huang 94822a5c95 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2017-01-20 09:57:05 +08:00
huang a8d25dab60 项目历史记录中“查看差别”:建议只有当issue描述内容更行时才“查看差别”,否则只显示一条更新记录即可 2017-01-20 09:08:26 +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
daiao a41b9d3a42 项目社区,课程社区的首页,点击项目列表或班级列表,网页标签显示“项目/课程-确实让创新更美好” 2017-01-18 09:44:11 +08:00
huang 55d16eb589 完成组织域名申请消息重构 2017-01-17 13:22:03 +08:00
huang b36089c45d 项目申请类消息处理 2017-01-16 11:31:10 +08:00
黄井泉 518bad811c Merge branch 'develop' into 'develop'
周五上线缺陷修复



See merge request !127
2017-01-13 17:44:29 +08:00
daiao cd76f92405 博客回复消息加入小铃铛;申请加入项目的操作样式修改 2017-01-13 17:00:43 +08:00
huang fbc70614ed 申请类消息冲突问题、user base几个取值的修改 2017-01-13 16:00:51 +08:00
daiao 0591440c9e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/controllers/users_controller.rb
	app/views/users/_user_message_forge.html.erb
	db/schema.rb
2017-01-13 11:28:33 +08:00
cxt cd23ba37b5 作业评价时,此次评价会覆盖该账号上传评价的信息,请在评分详情的页面上增加历史评分的隐藏功能 2017-01-12 17:25:16 +08:00
cxt ee4d676f11 竞赛提交增加作品成绩的导出 2017-01-12 11:14:27 +08:00
cxt 231fa56c49 管理员界面增加竞赛列表 2017-01-11 16:45:41 +08:00
cxt 46ecac094f 班级列表和项目列表的星星悬浮tip需要修改 2017-01-11 10:54:12 +08:00
cxt c44af451ce 竞赛增加留言模块 2017-01-11 10:16:25 +08:00
daiao 0f4deef8f6 首页的消息列表中加入“全部标为已读” 2017-01-10 15:53:48 +08:00
daiao 7467b9a74a 问吧所有页面的标签显示“问吧-确实让创新更美好” 2017-01-10 14:50:16 +08:00
cxt cc4d46c3ee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/common.css
2017-01-06 15:06:22 +08:00
cxt 9130111b2c 竞赛提交的评分 2017-01-06 15:00:14 +08:00
daiao 5cc362e6eb 我收到的作业 2017-01-05 10:14:56 +08:00
daiao e43ef02d57 我发布的作业 2017-01-05 09:06:41 +08:00
daiao f2229794f2 项目的issue列表“里程碑”的下拉选项中,按照历程的创建时间倒序 2017-01-04 13:48:58 +08:00
daiao 82a253765c 我收到的issues 2017-01-04 13:33:01 +08:00
cxt 59853b1558 竞赛的管理员、评委、参赛者列表 2017-01-03 17:05:27 +08:00