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

11505 Commits

Author SHA1 Message Date
cxt a60c83fe00 超级管理员要有对竞赛通知编辑、删除的权限 2016-12-30 20:35:40 +08:00
huang 6fcf80cd3c 修改统计数字 2016-12-30 20:31:19 +08:00
cxt a5e6ed0d39 竞赛“提交”的相关bug修复 2016-12-30 20:30:45 +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
daiao 78c8a006fc Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-30 17:27:33 +08:00
daiao 23dc37d5d2 点击右侧贴吧名，跳新页面 2016-12-30 17:26:47 +08:00
huang 2f864dbd99 memo点赞样式问题 2016-12-30 17:25:34 +08:00
cxt 2238cef9f1 竞赛提交截止后不可补交作品 2016-12-30 17:04:13 +08:00
daiao 2eaca7312a Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-30 16:52:46 +08:00
daiao 4c8ddde50d 贴吧保存失败提示 2016-12-30 16:52:16 +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 7f7edf53ac 平台超级管理员无法访问私有的竞赛，正确的应该是可以访问并进行操作 2016-12-30 16:43:29 +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
daiao 44acf1a383 贴吧的左侧导航栏样式调整，并调整新建贴吧提示样式 2016-12-30 15:34:01 +08:00
huang d9b6294883 解决个别user点击个人主页项目500问题 2016-12-30 15:14:52 +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
daiao a8d16a15de 去除贴吧右侧tag 2016-12-30 14:20:01 +08:00
cxt 6ba5f124e3 竞赛相关icon更换 2016-12-30 13:58:40 +08:00
cxt d1fbaa27b9 竞赛 ：作品--》提交 2016-12-30 13:58:09 +08:00
huang 48645e1d43 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-30 13:55:10 +08:00
huang 912752d646 问吧编辑的时候ajax局部刷新 2016-12-30 13:54:42 +08:00
daiao cc7f6b7d55 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-30 13:50:37 +08:00
daiao 70e8e51a5e 问吧-贴吧右侧js调整 2016-12-30 13:49:57 +08:00
huang 53cd3a197b 问吧编辑和新建代码封装 2016-12-30 13:47:31 +08:00
daiao e883194eaf Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-30 11:33:06 +08:00
daiao 37d82f6c8a 问吧的贴吧右上角标签，编辑和删除js 2016-12-30 11:32:32 +08:00
huang 11135bfabf 问吧编辑 2016-12-30 11:30:40 +08:00
cxt 738db43f34 具体竞赛页的邀请码tip没有显示、竞赛菜单的“暂停加入”和“删除” 2016-12-30 11:18:29 +08:00
daiao 6acb0b0a5d 问吧的我要提问，默认选择其进入的贴吧 2016-12-30 11:03:30 +08:00
daiao 16e1f0c701 导航栏“帮助中心”改为“问吧”，并调整帖子展示内容的高度 2016-12-30 10:45:22 +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 c22ee7664f 邮件显示内容距离调整 2016-12-30 09:45:03 +08:00
huang 365c9f810c memo新建 2016-12-29 18:02:56 +08:00
huang edee7adae3 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba 2016-12-29 17:19:27 +08:00
huang aa2dcb6719 先建帖子的时候添加返回按钮 2016-12-29 17:18:56 +08:00
huang e8cc1633d3 问吧一些改进 2016-12-29 17:15:54 +08:00
daiao 5137c1b4f2 新建贴吧页面样式调整 2016-12-29 17:10:26 +08:00
huang 3bdf26c63e 问吧位置加链接 2016-12-29 17:07:34 +08:00
daiao b70101b4ec 问吧提问界面样式调整 2016-12-29 16:56:08 +08:00
huang 6cd4e9e71d 问吧详情页面优化 2016-12-29 16:39:39 +08:00
huang 134bdcebf2 问吧 index页面优化 2016-12-29 16:21:39 +08:00
huang 9fcd5b48ed forum index页面分页及排序 2016-12-29 15:57:52 +08:00
daiao 143e33a891 问吧分页样式调整 2016-12-29 15:13:55 +08:00
daiao c8807b29ca 贴吧帖子的内容，设置高度限制（可点击“展开”与“收起”） 2016-12-29 15:01:21 +08:00
huang b9d2e08aae 用户注册激活页面内容为空的时候增加提示 2016-12-29 14:56:11 +08:00
huang f733e2a276 注册激活页面代码重构，及添加新的字体 2016-12-29 14:38:03 +08:00
daiao ba08bbf906 贴吧右侧的贴吧列表页面 2016-12-29 13:52:45 +08:00
huang b2a53b65f8 邮件激活页面，并添加留言功能 2016-12-29 10:47:35 +08:00
daiao bca1c84ec9 贴吧-我要提问页面 2016-12-29 10:39:11 +08:00
huang 91e452b0c8 邮件激活新页面 2016-12-28 17:58:27 +08:00
huang 10af2b14d1 新邮件激活页面500问题 2016-12-28 16:44:09 +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
daiao 017ed1b0b0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-28 16:36:45 +08:00
huang 3de52ab856 问吧新建的时候关联其它问吧 2016-12-28 16:29:25 +08:00
黄井泉 67139f84e0 Merge branch 'dev_newproject' into 'develop' 
邮件激活页面调整



See merge request !93
 2016-12-28 16:24:48 +08:00
huang a423909a71 完成memo详情相关页面及功能 2016-12-28 16:18:47 +08:00
daiao 527d00f233 用户激活页面 2016-12-28 16:18:13 +08:00
黄井泉 405aecb440 Merge branch 'dev_newproject' into 'develop' 
发送邮件的内容调整



See merge request !92
 2016-12-28 16:08:50 +08:00
daiao 2832c40244 发送邮件激活页面 2016-12-28 15:48:13 +08:00
huang da88c43e95 完成问吧 memo新建及 forum详情页面相关功能 2016-12-28 15:24:26 +08:00
daiao 880c66c659 基本资料页面的单位名称被清楚后，重新恢复提示 2016-12-28 14:40:42 +08:00
cxt 034a4c1b72 用户反馈匿评的时候字数限制太小,不够写下全部的评价,请将字数限制加大到500个字符 2016-12-28 14:06:57 +08:00
daiao fc439e562d 用户基本资料页面，去除“邮件通知”一项，未完善资料的用户隐藏新建入口 2016-12-28 13:46:01 +08:00
cxt bdd2a60d00 竞赛：加入竞赛、发布竞赛、发布通知等的消息 2016-12-28 11:30:31 +08:00
huang c3aa69029e 完成问吧idex页面及新家贴吧 2016-12-28 11:05:05 +08:00
cxt f10ab4c63d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-28 10:21:30 +08:00
cxt c1b5f8d77d 786竞赛图片更换 2016-12-28 10:21:11 +08:00
daiao 64c6fa1f37 首页显示的个人信息区域北京，换成灰度背景 2016-12-28 09:55:59 +08:00
huang fe20c45c26 新建贴吧弹框 2016-12-27 17:12:42 +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
黄井泉 8e2353d61e Merge branch 'develop' into 'develop' 
新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题

新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题

See merge request !88
 2016-12-27 16:27:19 +08:00
daiao cfa81fc79d 新建/编辑里程碑，名字相同时提示更改；课程的资源库动态无法被筛选；待审批消息旧数据依旧存在的问题 2016-12-27 16:18:23 +08:00
huang 465b3e7b52 问吧 base框架 2016-12-27 16:09:09 +08:00
cxt 1de4b48d34 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-27 14:28:30 +08:00
huang 4f6e9b2c3b 竞赛通知新建路由更改 2016-12-27 14:13:51 +08:00
cxt a9f16d0722 竞赛模块的弹框，样式没有全部使用最新的 2016-12-27 13:52:11 +08:00
huang 30d0cfc2af Merge branch 'develop' into dev_tieba 2016-12-27 13:28:36 +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 616e7a2a11 公共贴吧 2016-12-27 12:12:07 +08:00
cxt 76b13b1c05 竞赛列表的星星icon提示需要修改 2016-12-27 10:52:04 +08:00
huang 735cdb6a46 公共贴吧 2016-12-27 10:41:28 +08:00
cxt 68ade87e59 竞赛的题目下拉选项，点击无法进入正确的页面 2016-12-27 10:27:28 +08:00
cxt 3d30a11f66 导航栏头部增加竞赛入口 2016-12-27 10:06:56 +08:00
cxt b0aedc9882 竞赛列表的单位改成创建者 2016-12-27 09:41:22 +08:00
cxt 22a009e9d1 竞赛说明提示修改 2016-12-27 09:16:19 +08:00
huang d10a51df1b 部分用户主页 点击课程后500问题 2016-12-26 16:45:56 +08:00
huang 40c3d34a58 注册邮件内容后台可配 2016-12-26 15:40:43 +08:00
cxt 5cf5c5f421 通知详情不能编辑和删除 2016-12-24 21:00:42 +08:00
cxt 4067a9c4a7 title修改、通知的编辑删除、附件下载 2016-12-24 20:22:09 +08:00
cxt 631bcd508f 竞赛通知要可以编辑和删除 2016-12-24 19:34:03 +08:00
cxt cbefe70e00 bug修复 2016-12-24 19:12:33 +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 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
daiao 110bbd6c3b issue 动态样式宽度 2016-12-23 21:34:21 +08:00
huang 41312d82c5 竞赛动态中通知回复及删除局部刷新 2016-12-23 21:23:07 +08:00
huang b563b170bd 竞赛动态新闻 2016-12-23 21:13:40 +08:00
daiao dbd8802b9c 项目动态内容样式调整，重发邮件调整 2016-12-23 21:11:39 +08:00
daiao 0ce62b9e8c 关联commit数据为空时，显示调整 2016-12-23 20:34:23 +08:00
huang 69bacc1f6e base添加竞赛入口 2016-12-23 20:27:16 +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
daiao 1c868e5f12 Issue统计过滤条件样式调整。管理员帖子界面点击跳新页面 2016-12-23 18:42:44 +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
daiao 283f8035b9 邮件激活页面，点击“重新获取验证码”时间间隔设置为60秒，并调整按钮样式 2016-12-23 16:57:32 +08:00
daiao c3465537b5 pullrequest列表，点击跳新页面 2016-12-23 15:41:52 +08:00
daiao d10a12fadd 邮箱激活页面调整 2016-12-23 15:30:39 +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
daiao fd97d8b421 课程社区的首页动态，加入班级资源库动态 2016-12-23 14:03:43 +08:00
daiao 1f10a75150 项目社区首页，点击动态选项“论坛动态”报500问题 2016-12-23 11:12:05 +08:00
huang 244303f0e4 课程问卷 其它选项如果过多的时候默认显示， 添加“隐藏”和“显示”按钮 2016-12-23 10:54:19 +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 9f0b17424d 竞赛配置样式调整 2016-12-22 17:10:40 +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
huang eb7ecd4143 竞赛配置功能 2016-12-22 16:03:58 +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
daiao b4d4fa4e28 待办任务的所有列表页，首列加上发布人的头像 2016-12-22 14:49:19 +08:00
huang 01d9fbbef3 组织base框架 2016-12-22 14:47:42 +08:00
daiao 884a201953 项目加入申请，被审批后，其他管理员的消息显示加入操作人姓名（并将提示弹框改为新版） 2016-12-22 13:48:03 +08:00
cxt 5242e12373 竞赛框架搭建 2016-12-22 10:01:37 +08:00
daiao c42861c8b5 个人主页，待办任务数字实时刷新 2016-12-21 17:27:53 +08:00
daiao 97148ae172 个人首页左侧导航栏的字体样式调整 2016-12-21 16:20:50 +08:00
daiao 63bad2383b 首页左侧导航栏课程，项目，我发布的issue等数字样式调整 2016-12-21 11:03:38 +08:00
daiao 80657e4ee7 顶部导航栏的各个入口，点击打开新的页面 2016-12-21 10:38:02 +08:00
daiao adce17c877 首页的消息列表头像换成圆形 2016-12-21 09:49:09 +08:00
daiao c481ee6536 项目的讨论区和资源库翻页做成新样式 2016-12-21 08:48:16 +08:00
daiao d92f4ee6c6 贴吧个模块的具体帖子显示的贴吧标题，加入链接，点击进入具体的贴吧 2016-12-20 17:17:38 +08:00
daiao 34e250f953 动态文字内容宽度调整至于齿轮中线对齐 2016-12-20 16:59:01 +08:00
daiao 3ff56f83ba 修复管理员界面，班级与项目帖子链接，进入讨论区的缺陷 2016-12-20 16:16:30 +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 b34129e812 commit 历史变更页面commit id颜色 蓝色->浅灰 2016-12-19 15:48:33 +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
huang 3bf6c35d0e 我(Ta)的主页 课程、项目链接修改 2016-12-19 11:33:14 +08:00
huang 9a6a4a5203 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-19 09:55:07 +08:00
cxt 35dfdeea98 消息报500 2016-12-17 18:01:08 +08:00
cxt fc6d2f1155 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-17 17:59:05 +08:00
cxt c444096a04 消息列表报500 2016-12-17 17:58:31 +08:00
陈晓婷 7d2bcaada3 Merge branch 'develop' into 'develop' 
项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误

项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误

See merge request !75
 2016-12-17 17:10:09 +08:00
daiao 96e02cd48f 项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误 2016-12-17 17:04:44 +08:00
cxt 4755294743 班级作业：老师或助教同意申诉后，作品列表中“同意/拒绝”、“申诉中”、分数没有自动刷新 2016-12-17 16:26:06 +08:00
daiao d16e9e4ecd Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-17 15:38:49 +08:00
daiao 73747a81d6 个人主页消息铃铛翻页 2016-12-17 15:34:26 +08:00
cxt ef78de1a9c 班级分组作业：评分设置中勾选启用匿评申诉，点击确定按钮报500 2016-12-17 14:50:40 +08:00
cxt 21377fa45a 班级作业：评分设置中“最终评分”设置为“助教评分+学生匿评”不可用 2016-12-17 14:36:32 +08:00
cxt f7f1c68576 匿评申诉的错别字、匿评申诉：评阅人、老师或助教点击收到的申诉消息返回对应的作品列表，建议定位到对应的作品 2016-12-17 14:10:51 +08:00
cxt d9dcb3b291 “我的作业”页面中“评分”建议跳转到作品列表，而不是作业信息页面 2016-12-17 10:41:30 +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 d6c51cce2a 首页：如图关注列表中添加关注、取消关注后关注数统计未自动刷新 2016-12-17 10:20:08 +08:00
daiao b76dd30b6d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-17 10:17:34 +08:00
daiao 882ceb6a63 个人主页样式调整 2016-12-17 10:12:56 +08:00
cxt e29eb67f68 课程列表中删除课程确认弹框中“关闭”改为“取消” 2016-12-17 10:07:51 +08:00
cxt d876962f05 课程社区和项目社区的左侧列表无法收回 2016-12-17 09:53:23 +08:00
cxt 16fe5f58a1 详细列表的样式调整 2016-12-17 09:38:48 +08:00
cxt 2275a0ecae 首页、课程社区、项目社区的点击展开更多 2016-12-17 09:38:32 +08:00
cxt b661593e29 问卷创建者不应填问卷 2016-12-17 09:37:26 +08:00
huang ea3b71df8d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-16 21:01:27 +08:00
huang de86584850 个人主页 我的issue 分页不能点的问题 2016-12-16 20:58:53 +08:00
黄井泉 353073c82a Merge branch 'develop' into 'develop' 
个人主页功能

个人主页功能

See merge request !67
 2016-12-16 20:57:21 +08:00
daiao 0c8774416e 个人主页样式调整 2016-12-16 20:50:48 +08:00
daiao 72ff880424 个人主页样式调整 2016-12-16 20:19:57 +08:00
cxt 48045cf85b 首页消息列表样式调整 2016-12-16 19:55:38 +08:00
huang 611494ec93 系统消息只显示30天前的 2016-12-16 19:36:37 +08:00
huang 7a28564239 项目404问题 2016-12-16 19:09:03 +08:00
cxt 7777e63647 首页消息列表样式修改 2016-12-16 19:08:54 +08:00
daiao e30006be39 个人主页样式调整 2016-12-16 18:47:15 +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
daiao 122d3964ed 个人主页样式调整 2016-12-16 16:25:18 +08:00
huang c477d15fae Merge branch 'dev_newproject' into develop 2016-12-16 16:13:26 +08:00
daiao db3d403ec9 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 2016-12-16 16:12:30 +08:00
cxt 552b6429ef 消息列表的样式调整 2016-12-16 16:11:19 +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 88f376205d 个人主页待完成作业500问题 2016-12-16 14:33:09 +08:00
huang 7f3b29830e 个人主页任务显示tip简化，及没有内容不显示 2016-12-16 14:21:51 +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 ac803cab63 fork项目提示 2016-12-16 14:02:21 +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
huang 5b93bf2b4d pull request中如果登录名在Trustie中不存在则有匿名改成登录名；匿名用户改成邮箱显示 2016-12-15 14:36:08 +08:00
huang 53ecbdf8f0 issue详情中添加截止日期 2016-12-15 12:25:36 +08:00
huang 5facd08af6 issue新建和编辑样式调整 2016-12-15 12:24:57 +08:00
cxt d70b779c92 匿评申诉：评分设置 2016-12-15 10:19:16 +08:00
huang 75f2b013a6 个人主页未解决issue分页不能用问题 2016-12-15 09:40:41 +08:00
黄井泉 bf6bdc8c9e Merge branch 'dev_newproject' into 'develop' 
Pull Request冲突提醒及处理、Issue编辑跳详情问题、Issue编辑返回空白问题



See merge request !57
 2016-12-15 09:28:05 +08:00
daiao ffd1e3942c 个人主页tab列表 2016-12-15 09:13:39 +08:00
huang 9b2781999c commit 按钮样式调整 2016-12-14 17:04:52 +08:00
huang e205a08573 issue commit 关联样式调整 2016-12-14 16:57:56 +08:00
huang 58a45e8f16 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-14 15:21:56 +08:00
siteen 4e854776d1 issue详情右侧样式问题 2016-12-14 14:08:08 +08:00
cxt 23e1f2b3bd 作业匿评期间，小铃铛消息、作业动态以及作品详情的回复显示，暴露了评阅人或匿评对象的信息 2016-12-14 13:37:52 +08:00
daiao 0d4dc89c73 个人主页的tab的JS及其样式 2016-12-14 10:17:39 +08:00
cxt 5ef8f19fbd 班级的归档提示不完整 2016-12-14 09:38:19 +08:00
cxt 8c1e2da2d3 新建个人主页的标题栏，去除输入例的说明 2016-12-14 09:16:50 +08:00
daiao f124470af2 Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 
Conflicts:
	app/views/users/show.html.erb
 2016-12-13 17:30:09 +08:00
cxt a8335f841d 提示修改 2016-12-13 17:26:44 +08:00
daiao 54687793ec 铃铛样式重新排版 2016-12-13 17:22:30 +08:00
cxt 633c314a67 IE浏览器提交作品给出提示 2016-12-13 17:21:10 +08:00
cxt ec476cbd74 班级头部的调整 2016-12-13 16:16:32 +08:00
huang a2b7778de1 对齐 2016-12-13 14:22:15 +08:00
huang 17ae5e6e8d 编辑issue点击取消的时候空白问题 2016-12-13 14:02:58 +08:00
cxt 30dccdec90 个人首页的待匿评作品、待完成问卷 2016-12-13 13:57:25 +08:00
huang 0c8447ac83 多个地方的Issue编辑跳至详情页面问题 2016-12-13 13:51:08 +08:00
huang 6434644975 解决issue编辑跳到issue详情的问题 2016-12-13 13:42:33 +08:00
huang 49862a0be9 pull request合并代码冲突提示 2016-12-13 13:33:55 +08:00
cxt 203d98133a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-13 11:07:26 +08:00
cxt 90c3c33dd4 ke编辑的样式与显示样式不一致 2016-12-13 11:07:03 +08:00