Commit Graph

896 Commits

Author SHA1 Message Date
cxt 2a7a8fcdb4 班级作业的最终得分设置修改,由用户决定教师、助教和匿评的百分比计算 2017-03-30 15:31:07 +08:00
陈晓婷 66553a2a5e Merge branch 'develop' into 'develop'
本周任务上线



See merge request !164
2017-03-10 13:55:31 +08:00
cxt 149b837aff 作业启用匿评的默认设置出错,只余一天的期间了 2017-03-09 13:58:53 +08:00
daiao e88918916a 点击消息后红色按钮不消失 2017-03-07 14:19:17 +08:00
cxt 4688fbaec9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-03-03 14:45:17 +08:00
daiao 20cc376246 注册激活页面的更换邮箱,更换一次之后,第二次弹框显示的原邮箱不正确 2017-03-01 15:51:12 +08:00
cxt 524dd85409 班级新建作业,加入题库时,没有将附件一起加入 2017-02-28 10:11:58 +08:00
cxt 0544cd2746 从题库发送的题,与从题库选用的题,不应该再有“加入题库”选项 2017-02-27 15:44:11 +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
daiao 75f1fc964a 实训任务项目动态展开更多与收起回复功能 2017-02-23 17:09:22 +08:00
daiao 1e56a69eed 动态消息的实训动态添加回复/二级回复功能 2017-02-23 16:12:29 +08:00
daiao 06306e0214 实训项目叠层回复功能 2017-02-22 10:08:05 +08:00
cxt c3cd2ea153 班级的编程作业在新建和编辑时,需要增加输入输出样例的录入入口 2017-02-18 18:00:52 +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 eb5f5f9ede 资源库:上传资源弹框使用新样式 2017-02-08 13:42:53 +08:00
daiao d0f7bf9e97 我收到的issue和我发布的issue导出excel统一 2017-01-20 20:40:31 +08:00
daiao bf09d4f176 我收到issue导出excel名称修改 2017-01-20 20:36:52 +08:00
huang 09f7cbf611 申请类消息排序 2017-01-20 20:11:36 +08:00
daiao 43cbb18aaf 待审批的消息 2017-01-20 19:58:25 +08:00
daiao 695c9a022b 我收到的Issue列表导出的excel名称改为:我收到的isuee 2017-01-20 16:37:03 +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
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 5a961c8ee7 解决blog删除、blog回复500问题 2017-01-19 17:26: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 208ca67d35 项目社区加入资源库动态 2017-01-19 09:34:34 +08:00
huang 11c5b0ab41 个人主页申请类消息优化,性能提升1s多,查询时间22ms 2017-01-18 14:14:44 +08:00
daiao a41b9d3a42 项目社区,课程社区的首页,点击项目列表或班级列表,网页标签显示“项目/课程-确实让创新更美好” 2017-01-18 09:44:11 +08:00
huang 9734c46b2f 个人主页申请类消息查询性能优化,申请类消息方法修改 2017-01-17 16:21:32 +08:00
huang f321082fdc 组织域名申请提示策略、消息存储表结构修改 2017-01-16 16:10:28 +08:00
cxt 1fadbcee22 首页课程相关过滤代码的优化 2017-01-16 14:45:33 +08:00
陈晓婷 20f999e33d Merge branch 'develop' into 'develop'
周五bug修复



See merge request !128
2017-01-13 18:53:48 +08:00
daiao 3fe99bb065 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-13 18:53:22 +08:00
daiao 10ed174801 全部设为已读优化 2017-01-13 18:51:34 +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
huang 5f57e99b1d 系统消息接口定义公用 2017-01-13 13:59:44 +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
huang be531d6abd 个人主页的一些优化 2017-01-13 11:13:22 +08:00
daiao 8a38e379ad 封装,优化本周代码 2017-01-13 10:14:10 +08:00
huang 4be495a7b0 系统消息查询/显示优化(减150ms) 2017-01-12 17:14:52 +08:00
huang d5a0133b0b 个人主页部分优化 2017-01-12 16:19:11 +08:00
daiao fd61782739 修复申请加入项目被审批后,出现的审批人名字错误的缺陷 2017-01-12 10:19:10 +08:00
daiao 13e17dd5a3 博客回复,加入消息提醒 2017-01-11 17:32:04 +08:00
daiao 3126d8312f 优化pullrequest代码 2017-01-11 09:27:37 +08:00
daiao 0f4deef8f6 首页的消息列表中加入“全部标为已读” 2017-01-10 15:53:48 +08:00
daiao a4a1b705f5 我发布的作业和我收到的作业,标题长度调整,并加入鼠标经过时,显示标题名称 2017-01-10 14:33:00 +08:00