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

14867 Commits

Author SHA1 Message Date
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
daiao a668ed7a81 待审批申请，被其他管理员审批的历史数据依旧还存在的问题 2016-12-27 09:07:16 +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 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
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 7b18f22528 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-23 20:34:54 +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 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
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
黄井泉 c058a0f21e Merge branch 'develop' into 'develop' 
邮件不走delay job



See merge request !84
 2016-12-23 15:38:17 +08:00
huang 33bc9aa47b 取消邮件delay job 2016-12-23 15:32:46 +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
huang 37f1aa1442 邮件相关改进 2016-12-23 14:29:48 +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
huang 55e1b0d8f2 settings 路由， 组织管理员、裁判、参赛人员方法封装 2016-12-22 14:50:26 +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 fddcbe2a56 新建竞赛 2016-12-22 11:17:13 +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 2f86fa5c5f 待审判用户，管理员批准时，其实管理员依旧还显示的问题 2016-12-21 14:56:49 +08:00
daiao 63bad2383b 首页左侧导航栏课程，项目，我发布的issue等数字样式调整 2016-12-21 11:03:38 +08:00
daiao 80657e4ee7 顶部导航栏的各个入口，点击打开新的页面 2016-12-21 10:38:02 +08:00
daiao 51f5bb6050 课程和项目的首页，在标签名称中显示 2016-12-21 10:29:54 +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
huang ff34ec6de8 版本库下载 参数加密 gitlab添加解密功能 2016-12-20 16:33:26 +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 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 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 711f234148 message 中重复发消息问题 2016-12-19 11:06:45 +08:00
huang cb33bec7db 讨论区发帖delay 模式优化 2016-12-19 10:24:36 +08:00
huang 9a6a4a5203 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-19 09:55:07 +08:00
guange 34f8450885 ids为空时不需要执行 2016-12-18 18:29:24 +08:00
guange d34ed4b744 切分一下，解决delayed_job卡死问题。 2016-12-18 18:25:14 +08:00
guange d7155afbe5 切分一下，解决delayed_job卡死问题。 2016-12-18 18:17:39 +08:00
guange 6ef7a15a5b 设置只读不需要放到delayed_job 2016-12-18 12:28:56 +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
cxt 158ea7dc41 问卷报网络异常 2016-12-17 15:36:45 +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 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
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 1566111d11 新建问卷发布多条班级动态 2016-12-16 13:49:26 +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
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 ea6078ee5f Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-15 10:20:26 +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
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 9b2781999c commit 按钮样式调整 2016-12-14 17:04:52 +08:00
huang e205a08573 issue commit 关联样式调整 2016-12-14 16:57:56 +08:00
huang 185e8957e6 student_works_scores_appeal model 2016-12-14 16:00:38 +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
siteen 413efa8d02 gitlab数据同步一致性任务 2016-12-13 17:21:58 +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
guange 5074d61dba 修改个人信息中的邮箱去除 2016-12-13 11:04:31 +08:00
cxt eaaca22e4d 老师给未提交的作品评语时不应变为已提交 2016-12-13 09:49:11 +08:00
cxt 9715cba687 用户待完成的测验、用户待完成的作业 2016-12-12 16:44:01 +08:00
daiao 120f65401b Merge branch 'develop' of https://git.trustie.net/daiao/trustieforge into develop 2016-12-12 15:58:06 +08:00
cxt 93cf24cf41 首页消息提醒、消息动态样式 2016-12-12 15:57:26 +08:00
cxt 3402c011f8 班级左侧活跃度和英雄榜的“积分规则”字样去除 2016-12-12 13:52:18 +08:00
cxt 065900b02a 班级学生列表中、作品列表中点击姓名返回个人主页，建议是弹出新的tab页 2016-12-12 11:23:44 +08:00
huang 6e67e4a5c7 0 2016-12-12 10:55:19 +08:00
daiao 1fd6ccf3ff Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-12 10:00:51 +08:00
daiao 0f328d36e1 代码改进 2016-12-12 10:00:05 +08:00
黄井泉 255b8db9a4 Merge branch 'dev_newproject' into 'develop' 
部分项目404问题



See merge request !55
 2016-12-09 22:01:23 +08:00
huang 818e63386c 部分项目404问题 2016-12-09 21:58:47 +08:00
黄井泉 ad1f1f3fec Merge branch 'dev_newproject' into 'develop' 
issue新建的时候commit权限



See merge request !54
 2016-12-09 21:03:20 +08:00
daiao 6cec329ce3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-09 21:01:39 +08:00
huang 90c8ee2d69 issue新建的时候commit关联权限 2016-12-09 21:00:55 +08:00
黄井泉 f3385cb0b4 Merge branch 'dev_newproject' into 'develop' 
issue详情删除commit权限



See merge request !53
 2016-12-09 20:41:41 +08:00
huang b85cad8c7f issue详情删除权限 2016-12-09 20:40:30 +08:00
daiao 66b46bf7b2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-09 20:30:14 +08:00
黄井泉 47e09e644e Merge branch 'dev_newproject' into 'develop' 
Commit的分页及一些修改



See merge request !52
 2016-12-09 20:27:59 +08:00
huang 85ef1108c9 翻页及commit详情 2016-12-09 20:26:32 +08:00
huang 9d0a941926 issue commit的一些改进 2016-12-09 20:06:10 +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 5970fc608b 项目简介字体调整 2016-12-09 17:37:39 +08:00
huang 50a4db24ec 组织二级域名对一些关键做限制 2016-12-09 17:26:36 +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
cxt b0559788db 班级作业的左侧“班级活跃度”、“班级英雄榜”“班级推荐”修改文字 2016-12-09 10:12:05 +08:00
cxt 67d23a2161 多级回复的显示调整 2016-12-09 10:01:53 +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 92871ff925 弹框样式调整、作业截止后附件不能删除 2016-12-08 16:24:17 +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
huang c84d17bd6a 用户邮箱没注册时候显示用户邮箱方法封装 2016-12-08 09:36:01 +08:00
huang 8ba747e195 版本库diff页面（Issue和commit关联） 2016-12-08 09:16:14 +08:00
cxt c24f9b8c3b 作业的小齿轮菜单增加“启用匿评”的选项，同时更新“禁用匿评”的提示信息、禁用匿评的作业截止后也可以编辑“是否启用匿评” 2016-12-07 17:23:52 +08:00
cxt c088af4ea8 成绩仅对自己可见：作业的匿评，评分者自己也看不到成绩了 2016-12-07 15:57:51 +08:00
huang 64b8c0c3f3 issue edit方法优化 2016-12-07 15:47:57 +08:00
huang 12b73f54d3 commit issue关联提供删除功能，局部刷新 2016-12-07 15:39:48 +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
daiao 69d9228808 个人主页的消息页面 2016-12-07 15:13:51 +08:00
huang c256462170 issue与commit关联的更新操作 2016-12-07 14:03:07 +08:00
huang 378427d070 issue 关联commit 流程及数据创建 2016-12-07 10:53:36 +08:00
daiao e6763c6d0c 用户消息铃铛样式调整 2016-12-07 09:00:33 +08:00
huang 33a4186e69 完成issue和commit关联创建。去重，及相关局部刷新 2016-12-06 17:37:07 +08:00
cxt 03b00f0af5 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-12-06 16:17:46 +08:00