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

1872 Commits

Author SHA1 Message Date
cxt 18ea262f34 班级配置-添加成员-角色编辑：将角色编辑为教师或助教单个角色时，点击保存无反应 2017-02-10 16:11:33 +08:00
cxt e4ebd4dd2c 班级的统计模块显示“活跃度”、“英雄榜”、“项目活跃度”(单个作业的过滤未完成) 2017-02-10 14:35:43 +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
cxt 2995c05b06 sw_1用户访问875班级却报403 2017-01-20 11:16:35 +08:00
huang 74ed832b68 开源检索数据迁移 2017-01-20 10:25:15 +08:00
cxt ac80805932 班级统计功能（暂未完成） 2017-01-20 10:16:51 +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
cxt 17b6babd5b 竞赛通知的回复，多级回复时，消息发送对象错误 2017-01-18 15:02:23 +08:00
cxt ac713a7136 竞赛发布留言、回复留言的消息通知 2017-01-18 14:13:25 +08:00
huang 9734c46b2f 个人主页申请类消息查询性能优化，申请类消息方法修改 2017-01-17 16:21:32 +08:00
huang 55d16eb589 完成组织域名申请消息重构 2017-01-17 13:22:03 +08:00
daiao e03d80de69 贴吧帖子创建人删除帖子报“页面不存在”的问题 2017-01-16 15:28:56 +08:00
huang b36089c45d 项目申请类消息处理 2017-01-16 11:31:10 +08:00
daiao cd76f92405 博客回复消息加入小铃铛；申请加入项目的操作样式修改 2017-01-13 17:00:43 +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 5251ab9ca2 为班级新添加的学生创建已发布作业的作品，状态为未提交 2017-01-12 17:27:04 +08:00
cxt cd23ba37b5 作业评价时，此次评价会覆盖该账号上传评价的信息，请在评分详情的页面上增加历史评分的隐藏功能 2017-01-12 17:25:16 +08:00
huang d5a0133b0b 个人主页部分优化 2017-01-12 16:19:11 +08:00
daiao 13e17dd5a3 博客回复，加入消息提醒 2017-01-11 17:32:04 +08:00
cxt c44af451ce 竞赛增加留言模块 2017-01-11 10:16:25 +08:00
daiao 84a0c1d7b7 将pulrequest放入小铃铛消息并加入到待审批消息；调整贴吧样式，及其个人主页头部样式 2017-01-10 14:22:27 +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 1ff6372d61 merge 2017-01-06 09:39:28 +08:00
daiao 62a7d6f76e 贴吧吧主增加删除帖子。删除回复功能 2017-01-06 09:22:01 +08:00
cxt 63d29b38ca 设置了评分的竞赛作品提交有问题 2017-01-04 17:20:22 +08:00
cxt 9f62c3d22a 竞赛相关消息通知的完善 2017-01-04 15:53:36 +08:00
cxt 6d894c53d5 竞赛讨论区的置顶和锁定 2016-12-30 19:53:00 +08:00
黄井泉 74b37947f1 Merge branch 'develop' into 'develop' 
本周上限任务



See merge request !95
 2016-12-30 17:33:30 +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
cxt 73350e34f1 竞赛作品的相关设置 2016-12-30 10:30:21 +08:00
huang 10af2b14d1 新邮件激活页面500问题 2016-12-28 16:44:09 +08:00
daiao fc439e562d 用户基本资料页面，去除“邮件通知”一项，未完善资料的用户隐藏新建入口 2016-12-28 13:46:01 +08:00
cxt bdd2a60d00 竞赛：加入竞赛、发布竞赛、发布通知等的消息 2016-12-28 11:30:31 +08:00
guange 5d4a3d8235 ids为空时不需要执行 2016-12-27 21:44:10 +08:00
cxt 3dbb955f1b 竞赛：作品列表的关联项目页面中，管理员有权限访问相关项目 2016-12-27 14:53:52 +08:00
huang a354699b42 邮件国际化丢失等问题 2016-12-27 13:02:22 +08:00
huang e614a2d111 修复500问题 2016-12-27 12:33:08 +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 40c3d34a58 注册邮件内容后台可配 2016-12-26 15:40:43 +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 9af9945cb4 竞赛 2016-12-24 16:29:10 +08:00
huang 854de1fae6 新建竞赛通知发送消息， 及竞赛通知删除 2016-12-23 20:19:17 +08:00
huang 43bb3fe4eb 完成竞赛通知 列表页面 2016-12-23 19:35:02 +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
huang 33bc9aa47b 取消邮件delay job 2016-12-23 15:32:46 +08:00
cxt 544702e11f 新建题目 2016-12-23 14:41:21 +08:00
huang 37f1aa1442 邮件相关改进 2016-12-23 14:29:48 +08:00
cxt 9331525304 竞赛消息的调整 2016-12-22 17:13:10 +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 4c5a2aa40b 加入竞赛 2016-12-22 15:08:15 +08:00
cxt fddcbe2a56 新建竞赛 2016-12-22 11:17:13 +08:00
cxt 5242e12373 竞赛框架搭建 2016-12-22 10:01:37 +08:00
huang 711f234148 message 中重复发消息问题 2016-12-19 11:06:45 +08:00
huang cb33bec7db 讨论区发帖delay 模式优化 2016-12-19 10:24:36 +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
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
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
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
daiao 1ff1ed3c54 个人主页 2016-12-16 14:03:01 +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
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
黄井泉 bf6bdc8c9e Merge branch 'dev_newproject' into 'develop' 
Pull Request冲突提醒及处理、Issue编辑跳详情问题、Issue编辑返回空白问题



See merge request !57
 2016-12-15 09:28:05 +08:00
huang 185e8957e6 student_works_scores_appeal model 2016-12-14 16:00:38 +08:00
siteen 413efa8d02 gitlab数据同步一致性任务 2016-12-13 17:21:58 +08:00
huang 6e67e4a5c7 0 2016-12-12 10:55:19 +08:00
daiao 0f328d36e1 代码改进 2016-12-12 10:00:05 +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
guange dcfb9d589e 微信关注提示语优化 2016-12-05 16:27:25 +08:00
huang 6ebaa1c90a Merge branch 'develop' into dev_newproject 2016-12-05 11:12:52 +08:00
huang 5bc4c779ea issue和commit_id关联 2016-12-05 11:07:41 +08:00
guange d351827ba2 at功能实现 2016-12-04 19:20:02 +08:00
daiao ffce6f074f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-02 16:19:42 +08:00
daiao b48fc7ba3b pullrequest发送消息 2016-12-02 16:18:31 +08:00
黄井泉 42775a82f9 Merge branch 'cxt_course' into 'develop' 
班级作业增加设置选项：成绩公开范围



See merge request !37
 2016-12-02 14:53:55 +08:00
huang 2311731de4 Merge branch 'dai_ao' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-02 13:39:46 +08:00
daiao 77f252b538 Merge branch 'develop' into dai_ao 
Conflicts:
	app/controllers/pull_requests_controller.rb
	app/views/users/_user_message_course.html.erb
	app/views/users/_user_message_forge.html.erb
 2016-12-02 13:26:41 +08:00
huang aea81f2b10 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-02 13:23:55 +08:00
cxt ff6434d456 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	db/schema.rb
 2016-12-02 10:35:05 +08:00
陈晓婷 39258f4ac5 Merge branch 'develop' into 'develop' 
课程相关bug修复；叠层回复的“回复”、“赞”的显隐



See merge request !32
 2016-12-02 10:14:07 +08:00
cxt 0afed6624d 未参与匿评的缺评扣分 2016-12-02 10:04:11 +08:00
huang 9ee36f05bc 资源库专业分类model创建 2016-12-01 15:57:42 +08:00
huang bbc8d11f80 项目issue关联commit(未完成) 2016-12-01 14:21:40 +08:00
daiao 2e5cd96bb9 pullrequest发送消息 2016-12-01 11:31:48 +08:00