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

5688 Commits

Author SHA1 Message Date
huang 9734c46b2f 个人主页申请类消息查询性能优化，申请类消息方法修改 2017-01-17 16:21:32 +08:00
daiao b1a71d12a9 新注册用户（或资料不全的用户），进入的首页“基本资料”编辑页，导航栏显示新版 2017-01-17 16:12:01 +08:00
huang 55d16eb589 完成组织域名申请消息重构 2017-01-17 13:22:03 +08:00
cxt 9ccef85600 班级留言改版 2017-01-16 16:34:51 +08:00
huang f321082fdc 组织域名申请提示策略、消息存储表结构修改 2017-01-16 16:10:28 +08:00
cxt 1fadbcee22 首页课程相关过滤代码的优化 2017-01-16 14:45:33 +08:00
huang b36089c45d 项目申请类消息处理 2017-01-16 11:31:10 +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
黄井泉 4bd8fa0f51 Merge branch 'develop' into 'develop' 
bug修复



See merge request !126
 2017-01-13 17:34:15 +08:00
cxt a5a0f21ba4 首页进入我发布的作业，再编辑作业，确认编辑，却返回“我管理的作业” 2017-01-13 17:14:48 +08:00
daiao 0cf17b999f 个人博客，回复博客后，跳入带id的页面 2017-01-13 17:11:15 +08:00
黄井泉 b7ba349448 Merge branch 'develop' into 'develop' 
测试版个人主页500问题、用户主页申请类消息500问题、几个helper代码取值优化



See merge request !125
 2017-01-13 17:01:58 +08:00
daiao cd76f92405 博客回复消息加入小铃铛；申请加入项目的操作样式修改 2017-01-13 17:00:43 +08:00
huang fbc70614ed 申请类消息冲突问题、user base几个取值的修改 2017-01-13 16:00:51 +08:00
cxt eec1baeaa0 竞赛-评分设置：启用在线评审不可用 2017-01-13 15:59:19 +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
黄井泉 c177230b08 Merge branch 'develop' into 'develop' 
这周上线任务



See merge request !122
 2017-01-13 11:24:07 +08:00
cxt 8ce1c5a171 竞赛提交附件的下载 2017-01-13 11:17:21 +08:00
huang be531d6abd 个人主页的一些优化 2017-01-13 11:13:22 +08:00
cxt 2aa99f57ac 已开启匿评的作业编辑后变成了“禁用匿评”的作业 2017-01-13 10:49:00 +08:00
daiao 8a38e379ad 封装，优化本周代码 2017-01-13 10:14:10 +08:00
cxt cd23ba37b5 作业评价时，此次评价会覆盖该账号上传评价的信息，请在评分详情的页面上增加历史评分的隐藏功能 2017-01-12 17:25:16 +08:00
huang 4be495a7b0 系统消息查询/显示优化（减150ms） 2017-01-12 17:14:52 +08:00
huang d5a0133b0b 个人主页部分优化 2017-01-12 16:19:11 +08:00
cxt 80401154bc 分班添加成员的弹框样式修改、列表成员按学号升序排列 2017-01-12 14:40:34 +08:00
cxt ee4d676f11 竞赛提交增加作品成绩的导出 2017-01-12 11:14:27 +08:00
huang 0bd5cd52d7 修复版本库查看单个文件500问题 2017-01-12 10:25:13 +08:00
daiao fd61782739 修复申请加入项目被审批后，出现的审批人名字错误的缺陷 2017-01-12 10:19:10 +08:00
daiao 13e17dd5a3 博客回复，加入消息提醒 2017-01-11 17:32:04 +08:00
cxt 231fa56c49 管理员界面增加竞赛列表 2017-01-11 16:45:41 +08:00
cxt 14652ea6ff 项目社区/课程社区：如图将项目“设为公开/私有”，项目列表中状态没有自动刷新 2017-01-11 15:42:03 +08:00
huang f8f2c816fb 上线注释掉某些版本 2017-01-11 14:33:16 +08:00
cxt b42f7bd704 基于项目的分组作业,在作品提交时进入编辑页面,关闭了"启用匿评",关联的项目都不见了 2017-01-11 13:53:44 +08:00
cxt c44af451ce 竞赛增加留言模块 2017-01-11 10:16:25 +08:00
daiao 3126d8312f 优化pullrequest代码 2017-01-11 09:27:37 +08:00
daiao 0f4deef8f6 首页的消息列表中加入“全部标为已读” 2017-01-10 15:53:48 +08:00
huang a365453f9c trustie平台输入版本库地址让其跳入Trustie项目版本库 2017-01-10 14:49:50 +08:00
daiao a4a1b705f5 我发布的作业和我收到的作业，标题长度调整，并加入鼠标经过时，显示标题名称 2017-01-10 14:33:00 +08:00
daiao 84a0c1d7b7 将pulrequest放入小铃铛消息并加入到待审批消息；调整贴吧样式，及其个人主页头部样式 2017-01-10 14:22:27 +08:00
cxt 720bd6e63e 班级列表的导出成绩，虽然点击分班后导出成绩做了正确的调整，但是输入检索筛选后导出的依然是全部学生的成绩 2017-01-10 11:20:59 +08:00
cxt fe24382157 竞赛的成员配置页，增加“单位名称”的显示，同时增加excel导出功能 2017-01-10 11:00:18 +08:00
huang dc6a515f08 解决部分路由不正确报500问题，让其跳转至404 2017-01-10 09:19:37 +08:00
huang 1a2063fe7e 某个页面跳入登录，登录成功后返回当前页面 2017-01-09 16:32:15 +08:00
huang c9bb226b0b 完成版本库 最新提交记录根据目录名的变化而变化功能 2017-01-09 15:34:37 +08:00
huang 9df3d2f46a 我发布的作业过滤排序 2017-01-06 19:50:18 +08:00
cxt 57565a122e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-06 18:59:32 +08:00
cxt 20581a68c7 班级讨论区、竞赛讨论区 删除子栏目中的帖子却返回主栏目帖子列表 2017-01-06 18:59:11 +08:00
黄井泉 f4cc2fca62 Merge branch 'develop' into 'develop' 
周五上线的一些修改



See merge request !113
 2017-01-06 18:51:04 +08:00
cxt b18d9f2eb3 课程列表的归档恢复 2017-01-06 17:33:45 +08:00
huang d99ec1db10 我收到的作业过滤后按创建时间倒序 2017-01-06 16:57:51 +08:00
huang c34812f8a3 我发布的作业，过滤后按创建时间倒序 2017-01-06 16:56:01 +08:00
cxt 83c00d1225 竞赛图片的上传 2017-01-06 15:52:34 +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 44e1a09906 竞赛图片上传 2017-01-06 15:03:01 +08:00
cxt 9130111b2c 竞赛提交的评分 2017-01-06 15:00:14 +08:00
guange 29dda04a2d 变量统一 2017-01-06 14:52:47 +08:00
黄井泉 a2bc649a56 Merge branch 'guange_dev' into 'develop' 
zip手工打包



See merge request !108
 2017-01-06 13:40:38 +08:00
黄井泉 62616b022d Merge branch 'develop' into 'develop' 
还原pullrequest小铃铛消息



See merge request !109
 2017-01-06 12:17:18 +08:00
daiao 4f2bd2dc31 还原pullrequest小铃铛消息 2017-01-06 12:15:46 +08:00
guange e369a45478 大于200M附件提示 2017-01-06 11:30:54 +08:00
guange 09356b593c 提供手工打包zip的命令 2017-01-06 10:47:25 +08:00
guange 1ff6372d61 merge 2017-01-06 09:39:28 +08:00
cxt 355d5b59fe 班级的学生列表，在页面上进行筛选操作后，点击导出成绩，导出的是全部成绩而不是筛选结果的成绩 2017-01-05 18:40:05 +08:00
cxt c976053297 班级作业的评分设置，增加助教评分模式的配置选项 2017-01-05 18:20:18 +08:00
daiao 602870069f 将pullrequest消息放入小铃铛内 2017-01-05 13:35:19 +08:00
daiao 5cc362e6eb 我收到的作业 2017-01-05 10:14:56 +08:00
daiao e43ef02d57 我发布的作业 2017-01-05 09:06:41 +08:00
cxt b539c201bc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-04 14:02:00 +08:00
cxt c36b454c6b 竞赛的子讨论区和子讨论区的配置页面 2017-01-04 14:01:46 +08:00
daiao 82a253765c 我收到的issues 2017-01-04 13:33:01 +08:00
daiao 432c98881b Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-04 10:41:38 +08:00
daiao 53d48b7559 我发布的Issue 2017-01-04 10:41:26 +08:00
huang 86baa2a850 邮件激活成功参数名字修改 2017-01-03 17:16:01 +08:00
cxt 59853b1558 竞赛的管理员、评委、参赛者列表 2017-01-03 17:05:27 +08:00
daiao 2a8cd2d935 我发布的issue（未完） 2017-01-03 15:42:37 +08:00
huang b9eb320d17 用户注册激活、token值过期添加提示 2017-01-03 15:20:31 +08:00
guange 498ad554ba 微信的@回复功能，不稳定 issue[11025] 2016-12-31 19:26:41 +08:00
huang 48f3338fbe 统计数 2016-12-30 22:20:29 +08:00
huang fc5e335429 问吧统计数字不一致的问题 2016-12-30 21:53:55 +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
黄井泉 fd9c423eb7 Merge branch 'develop' into 'develop' 
周五缺陷修复

周五缺陷修复

See merge request !98
 2016-12-30 21:16:08 +08:00
daiao fbfbc0cdeb 问吧样式调整 2016-12-30 21:05:14 +08:00
cxt 9d6f75fb3e 竞赛管理员有权限访问竞赛作品关联的私有项目，但访问关联项目的讨论区却报403 2016-12-30 20:59:13 +08:00
huang bef4e7be12 处理贴吧同名问题 2016-12-30 20:53:09 +08:00
huang 6fcf80cd3c 修改统计数字 2016-12-30 20:31:19 +08:00
cxt a5e6ed0d39 竞赛“提交”的相关bug修复 2016-12-30 20:30:45 +08:00
cxt 0f4e3f0189 竞赛：进入通知详情页面后，如图左侧导航的“讨论区”却加亮显示了 2016-12-30 20:29:54 +08:00
huang 82a3ff01ef 贴吧详情统计数修改 2016-12-30 20:14:31 +08:00
huang e33c62419a 贴吧编辑的时候tip修改；回复的时候去掉“发布成功”提示 2016-12-30 19:37:18 +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 a69e576fbc 问吧列表也只显示主贴 2016-12-30 17:10:12 +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 79ba4cd9b7 竞赛社区首页点击竞赛列表后，标签的名称变更了，应该始终显示“竞赛” 2016-12-30 16:45:53 +08:00
cxt cde8a8957c Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-30 16:37:43 +08:00
cxt 986fe7db86 竞赛增加讨论区模块 2016-12-30 16:37:20 +08:00
daiao 157d747b57 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-30 16:22:14 +08:00
daiao f332307cae 更改贴吧描述 2016-12-30 16:12:25 +08:00
huang a30ed19b40 moemo的创建与编辑公共部分封装；按钮过长隐藏 2016-12-30 15:52:08 +08:00
huang 2c7e7bed0b Merge branch 'develop' into dev_tieba 2016-12-30 15:04:43 +08:00
huang 58162dab95 问吧帖子编辑 2016-12-30 14:53:02 +08:00
huang 912752d646 问吧编辑的时候ajax局部刷新 2016-12-30 13:54:42 +08:00
huang 11135bfabf 问吧编辑 2016-12-30 11:30:40 +08:00
cxt 738db43f34 具体竞赛页的邀请码tip没有显示、竞赛菜单的“暂停加入”和“删除” 2016-12-30 11:18:29 +08:00
huang 6c86f655fd 贴吧没数据的显示 2016-12-30 10:44:28 +08:00
cxt 73350e34f1 竞赛作品的相关设置 2016-12-30 10:30:21 +08:00
huang fd291850ae 问吧帖子权限控制 2016-12-30 10:21:00 +08:00
huang a7bf421df8 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-30 10:03:10 +08:00
daiao b2bafe9c94 新建贴吧页面功能 2016-12-30 10:00:33 +08:00
huang 365c9f810c memo新建 2016-12-29 18:02:56 +08:00
huang 6cd4e9e71d 问吧详情页面优化 2016-12-29 16:39:39 +08:00
huang 134bdcebf2 问吧 index页面优化 2016-12-29 16:21:39 +08:00
huang b57384778e 解决注册激活页面刷新404的问题 2016-12-29 14:38:51 +08:00
huang b2a53b65f8 邮件激活页面，并添加留言功能 2016-12-29 10:47:35 +08:00
huang 91e452b0c8 邮件激活新页面 2016-12-28 17:58:27 +08:00
daiao 506d7ae82c Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-28 16:38:30 +08:00
huang 3de52ab856 问吧新建的时候关联其它问吧 2016-12-28 16:29:25 +08:00
huang a423909a71 完成memo详情相关页面及功能 2016-12-28 16:18:47 +08:00
huang da88c43e95 完成问吧 memo新建及 forum详情页面相关功能 2016-12-28 15:24:26 +08:00
cxt bdd2a60d00 竞赛：加入竞赛、发布竞赛、发布通知等的消息 2016-12-28 11:30:31 +08:00
huang c3aa69029e 完成问吧idex页面及新家贴吧 2016-12-28 11:05:05 +08:00
daiao 7c44a14fb5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-27 16:56:54 +08:00
daiao 50fb461f20 新建里程碑在项目内不能重名 2016-12-27 16:54:53 +08:00
cxt b10720520b Merge branch 'cxt_course' into develop 2016-12-27 16:38:26 +08:00
cxt 2b2498d66a 课程列表的班级收藏 2016-12-27 16:36:35 +08:00
daiao cfa81fc79d 新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题 2016-12-27 16:18:23 +08:00
huang 465b3e7b52 问吧 base框架 2016-12-27 16:09:09 +08:00
huang 30d0cfc2af Merge branch 'develop' into dev_tieba 2016-12-27 13:28:36 +08:00
huang 616e7a2a11 公共贴吧 2016-12-27 12:12:07 +08:00
daiao a668ed7a81 待审批申请，被其他管理员审批的历史数据依旧还存在的问题 2016-12-27 09:07:16 +08:00
cxt 4067a9c4a7 title修改、通知的编辑删除、附件下载 2016-12-24 20:22:09 +08:00
cxt e22e1caaed bug修复 2016-12-24 18:48:50 +08:00
daiao e86bd6728e Merge branch 'cxt_course' into develop 
Conflicts:
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/views/users/_user_activities.html.erb
	db/schema.rb
 2016-12-24 16:48:48 +08:00
cxt de9f5131b6 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-24 16:30:30 +08:00
daiao 84d5b5bc4a 竞赛列表 2016-12-24 16:29:53 +08:00
cxt 9af9945cb4 竞赛 2016-12-24 16:29:10 +08:00
huang a3dc06a4f7 新注册用户更改用户的时候用户名参数为空的问题处理 2016-12-24 12:05:48 +08:00
huang 4336d28dda gitlab同步修改用户 2016-12-24 11:57:10 +08:00
huang 87c134c007 登录名能修改 2016-12-24 11:16:33 +08:00
cxt 44b3f6019c Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-23 21:44:20 +08:00
cxt 86bd5b97b1 竞赛头部调整 2016-12-23 21:44:03 +08:00
huang b563b170bd 竞赛动态新闻 2016-12-23 21:13:40 +08:00
huang 854de1fae6 新建竞赛通知发送消息， 及竞赛通知删除 2016-12-23 20:19:17 +08:00
huang 2c97f12538 竞赛编辑功能 2016-12-23 19:56:00 +08:00
huang bc5846c2d6 竞赛通知 详情页面完成 2016-12-23 19:48:39 +08:00
huang 43bb3fe4eb 完成竞赛通知 列表页面 2016-12-23 19:35:02 +08:00
huang c98a8b5113 竞赛通知新建 2016-12-23 19:08:13 +08:00
huang 345d8b5045 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-23 17:00:37 +08:00
huang 0877aae0d6 竞赛通知 index方法 2016-12-23 17:00:11 +08:00
cxt a03c0f68c2 提交作品 2016-12-23 16:58:50 +08:00
cxt 544702e11f 新建题目 2016-12-23 14:41:21 +08:00
黄井泉 4125c1b44a Merge branch 'develop' into 'develop' 
issue详情页面一、二级回复、一级删除局部刷新



See merge request !80
 2016-12-23 14:35:51 +08:00
huang 37f1aa1442 邮件相关改进 2016-12-23 14:29:48 +08:00
daiao fd97d8b421 课程社区的首页动态，加入班级资源库动态 2016-12-23 14:03:43 +08:00
daiao a40b7f6fd0 申请项目，申请人接受到的消息调整为：申请人头像+申请姓名+消息 2016-12-23 09:34:23 +08:00
cxt 5a27b84e97 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-22 17:13:25 +08:00
cxt 9331525304 竞赛消息的调整 2016-12-22 17:13:10 +08:00
huang 3406d4ba0d Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-22 17:11:15 +08:00
huang f37c292e99 添加成员 2016-12-22 17:02:54 +08:00
huang b74c034237 项目配置添加ke编辑 base中去掉配置 2016-12-22 16:39:54 +08:00
cxt c4927070a0 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-22 16:05:12 +08:00
cxt 346dc069ef 加入竞赛的消息通知 2016-12-22 16:02:36 +08:00
huang 0d00b6ca74 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-22 15:17:54 +08:00
huang 037e717937 竞赛邀请码 竞赛settings（部分） 2016-12-22 15:17:02 +08:00
cxt cf8725f2ee Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-22 15:08:49 +08:00
cxt 4c5a2aa40b 加入竞赛 2016-12-22 15:08:15 +08:00
huang 01d9fbbef3 组织base框架 2016-12-22 14:47:42 +08:00
daiao 884a201953 项目加入申请，被审批后，其他管理员的消息显示加入操作人姓名（并将提示弹框改为新版） 2016-12-22 13:48:03 +08:00
cxt fddcbe2a56 新建竞赛 2016-12-22 11:17:13 +08:00
cxt 5242e12373 竞赛框架搭建 2016-12-22 10:01:37 +08:00
daiao 2f86fa5c5f 待审判用户，管理员批准时，其实管理员依旧还显示的问题 2016-12-21 14:56:49 +08:00
daiao 51f5bb6050 课程和项目的首页，在标签名称中显示 2016-12-21 10:29:54 +08:00
huang ff34ec6de8 版本库下载 参数加密 gitlab添加解密功能 2016-12-20 16:33:26 +08:00
daiao de44385548 Issue统计页面，增加用户筛选过滤条件的提示 2016-12-20 15:45:33 +08:00
daiao c2924e06e6 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-20 11:04:39 +08:00
daiao 2b60143f78 博客，班级的帖子标题和内容，留言显示出现英文单词分隔显示问题 2016-12-20 11:04:16 +08:00
huang d304555044 用户修改密码、删除项目成员 添加事务处理 2016-12-19 17:26:56 +08:00
huang 7faddc30c5 项目成员编辑 添加事务 2016-12-19 17:08:32 +08:00
huang 05d10e20d1 项目添加成员 使用事务处理 2016-12-19 17:04:27 +08:00
huang a3e3c9d4db 版本库创建添加事务处理（两边数据一致性） 2016-12-19 16:36:25 +08:00
huang cc68f33a5a issue 详情删除局部刷新 2016-12-19 15:29:39 +08:00
huang 1caf8d9935 issue 详情页面二级回复局部刷新 2016-12-19 15:16:45 +08:00
huang 3c1de111c6 issue回复局部刷新（项目动态、用户动态。issue详情） 2016-12-19 15:02:40 +08:00
guange 34f8450885 ids为空时不需要执行 2016-12-18 18:29:24 +08:00
guange 6ef7a15a5b 设置只读不需要放到delayed_job 2016-12-18 12:28:56 +08:00
daiao 96e02cd48f 项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误 2016-12-17 17:04:44 +08:00
daiao d16e9e4ecd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-17 15:38:49 +08:00
cxt 158ea7dc41 问卷报网络异常 2016-12-17 15:36:45 +08:00
daiao 73747a81d6 个人主页消息铃铛翻页 2016-12-17 15:34:26 +08:00
cxt 21377fa45a 班级作业：评分设置中“最终评分”设置为“助教评分+学生匿评”不可用 2016-12-17 14:36:32 +08:00
cxt fc67e6e3be Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_anonymous_evaluation_list.html.erb
 2016-12-17 10:25:48 +08:00
cxt 2275a0ecae 首页、课程社区、项目社区的点击展开更多 2016-12-17 09:38:32 +08:00
cxt b661593e29 问卷创建者不应填问卷 2016-12-17 09:37:26 +08:00
黄井泉 353073c82a Merge branch 'develop' into 'develop' 
个人主页功能

个人主页功能

See merge request !67
 2016-12-16 20:57:21 +08:00
daiao 72ff880424 个人主页样式调整 2016-12-16 20:19:57 +08:00
daiao e30006be39 个人主页样式调整 2016-12-16 18:47:15 +08:00
cxt a67d809168 在导出的Excel中，如果用户填写了其它，则应该在下方的列表中记录“其它（我录入的其它回复）” 2016-12-16 17:27:24 +08:00
cxt d8f098c6f4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-12-16 16:56:21 +08:00
huang f71ccb6c67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-16 16:30:25 +08:00
cxt 8e20dd1a5f issue详情页面的回复调整 2016-12-16 16:30:08 +08:00
黄井泉 48774d7ab7 Merge branch 'develop' into 'develop' 
个人主页

个人主页

See merge request !61
 2016-12-16 16:29:39 +08:00
黄井泉 85d01a7392 Merge branch 'guange_dev' into 'develop' 
去除个人信息编辑中的邮箱



See merge request !56
 2016-12-16 16:27:28 +08:00
huang c477d15fae Merge branch 'dev_newproject' into develop 2016-12-16 16:13:26 +08:00
huang 4c340a5822 个人主页申请类消息统计 2016-12-16 16:03:59 +08:00
daiao ce9f9ff209 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 2016-12-16 15:32:36 +08:00
daiao 27597cf6ed 个人主页 2016-12-16 15:32:30 +08:00
cxt bc16476646 首页待办任务个数的计算调整 2016-12-16 15:28:45 +08:00
daiao c42fd235e8 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 
Conflicts:
	app/views/users/_new_user_message.html.erb
	public/stylesheets/css/user.css
 2016-12-16 14:51:10 +08:00
cxt 0fe7b96473 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_new_user_message.html.erb
	public/stylesheets/css/user.css
 2016-12-16 14:41:37 +08:00
cxt 271cee79d1 待匿评的作业 2016-12-16 14:38:27 +08:00
huang a148f3c157 Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_new_user_message.html.erb
	public/stylesheets/css/user.css
 2016-12-16 14:06:17 +08:00
cxt 6dfebd447c 导入的试卷进入查看页报500 2016-12-16 14:05:14 +08:00
daiao 1ff1ed3c54 个人主页 2016-12-16 14:03:01 +08:00
huang c0391b967f 注册用户发送留言 、留言页面代码优化 2016-12-16 11:42:52 +08:00
cxt 710c06e41a 匿评成绩的申诉功能 2016-12-16 11:01:58 +08:00
huang 6e83d41ea4 pull request留言权限控制，非项目成员不能提交评论 2016-12-15 17:12:41 +08:00
huang 5527adb795 版本406异常处理，pull request 冲突接受后406异常提醒 2016-12-15 17:03:59 +08:00
cxt d70b779c92 匿评申诉：评分设置 2016-12-15 10:19:16 +08:00
huang 79fc4b7752 Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into dai_ao 
Conflicts:
	Gemfile
	app/controllers/pull_requests_controller.rb
 2016-12-15 09:26:24 +08:00
guange 6d272d2034 解决win10浏览器乱码问题 2016-12-15 09:19:15 +08:00
daiao ffd1e3942c 个人主页tab列表 2016-12-15 09:13:39 +08:00
huang 58a45e8f16 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-14 15:21:56 +08:00
cxt 30dccdec90 个人首页的待匿评作品、待完成问卷 2016-12-13 13:57:25 +08:00
cxt eaaca22e4d 老师给未提交的作品评语时不应变为已提交 2016-12-13 09:49:11 +08:00
cxt 9715cba687 用户待完成的测验、用户待完成的作业 2016-12-12 16:44:01 +08:00
huang 6e67e4a5c7 0 2016-12-12 10:55:19 +08:00
daiao 0f328d36e1 代码改进 2016-12-12 10:00:05 +08:00
daiao fb62d4f1b2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/project.css
 2016-12-09 20:00:07 +08:00
daiao 92bc7aa813 个人首页的7个tab 2016-12-09 19:32:00 +08:00
huang 41b6c64af3 Merge branch 'guange_dev' into develop 2016-12-09 16:53:18 +08:00
guange 34b14b4e51 微信bug修改 2016-12-09 16:52:01 +08:00
黄井泉 b8eee2b131 Merge branch 'cxt_course' into 'develop' 
本周上线任务



See merge request !50
 2016-12-09 16:43:00 +08:00
cxt 0b217b9998 基于项目的分做作业，关联项目列表需要增加“更换项目”的功能 2016-12-09 16:39:24 +08:00
黄井泉 74a20dddc1 Merge branch 'dev_newproject' into 'develop' 
Issue和commit关联功能



See merge request !49
 2016-12-09 14:17:06 +08:00
huang 2a5bb6dcb8 Merge branch 'guange_dev' into develop 
Conflicts:
	Gemfile
 2016-12-09 09:35:12 +08:00
huang d98b1e17cc Gitlab提供搜索接口，commit 关联提供搜索功能及局部刷新 2016-12-08 16:36:11 +08:00
cxt 9ca4001c8c 追加附件的调整 2016-12-08 15:29:51 +08:00
daiao 1875b6ecf7 个人首页的项目社区 2016-12-08 14:14:52 +08:00
cxt abdbfd87b0 班级的邀请码增加“停用”和“启用”功能，停用的邀请码不允许用户主动加入班级 2016-12-08 13:40:11 +08:00
huang 0785c71308 issue和commit关联的一些修改和调整 2016-12-08 11:26:37 +08:00
daiao 224c0b686c 个人首页的课程社区 2016-12-08 09:59:22 +08:00
huang a1a96e4667 issue编辑优化，性能简单优化 2016-12-08 09:55:41 +08:00
huang 122946804d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-12-08 09:36:36 +08:00
cxt c24f9b8c3b 作业的小齿轮菜单增加“启用匿评”的选项，同时更新“禁用匿评”的提示信息、禁用匿评的作业截止后也可以编辑“是否启用匿评” 2016-12-07 17:23:52 +08:00
huang 64b8c0c3f3 issue edit方法优化 2016-12-07 15:47:57 +08:00
cxt 9a830fc907 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 
Conflicts:
	app/controllers/users_controller.rb
	app/views/layouts/new_base_user.html.erb
 2016-12-07 15:21:25 +08:00
cxt 27d800a94a 新版首页架构 2016-12-07 15:15:00 +08:00