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

889 Commits

Author SHA1 Message Date
daiao 5cc362e6eb 我收到的作业 2017-01-05 10:14:56 +08:00
daiao e43ef02d57 我发布的作业 2017-01-05 09:06:41 +08:00
daiao 82a253765c 我收到的issues 2017-01-04 13:33:01 +08:00
daiao 53d48b7559 我发布的Issue 2017-01-04 10:41:26 +08:00
daiao 2a8cd2d935 我发布的issue（未完） 2017-01-03 15:42:37 +08:00
cxt 79ba4cd9b7 竞赛社区首页点击竞赛列表后，标签的名称变更了，应该始终显示“竞赛” 2016-12-30 16:45: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 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
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 9331525304 竞赛消息的调整 2016-12-22 17:13:10 +08:00
cxt 346dc069ef 加入竞赛的消息通知 2016-12-22 16:02:36 +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
daiao 2b60143f78 博客，班级的帖子标题和内容，留言显示出现英文单词分隔显示问题 2016-12-20 11:04:16 +08:00
daiao 96e02cd48f 项目社区、课程社区点击我的动态错误，新建用户个人主页显示错误 2016-12-17 17:04:44 +08:00
daiao 73747a81d6 个人主页消息铃铛翻页 2016-12-17 15:34:26 +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
daiao 72ff880424 个人主页样式调整 2016-12-16 20:19:57 +08:00
daiao e30006be39 个人主页样式调整 2016-12-16 18:47:15 +08:00
huang f71ccb6c67 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-12-16 16:30:25 +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 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
daiao 1ff1ed3c54 个人主页 2016-12-16 14:03:01 +08:00
huang c0391b967f 注册用户发送留言 、留言页面代码优化 2016-12-16 11:42:52 +08:00
daiao ffd1e3942c 个人主页tab列表 2016-12-15 09:13:39 +08:00
cxt 30dccdec90 个人首页的待匿评作品、待完成问卷 2016-12-13 13:57:25 +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
daiao 1875b6ecf7 个人首页的项目社区 2016-12-08 14:14:52 +08:00
daiao 224c0b686c 个人首页的课程社区 2016-12-08 09:59:22 +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
daiao e6763c6d0c 用户消息铃铛样式调整 2016-12-07 09:00:33 +08:00
cxt 494946c70e 匿评结束后提交的作品也应计算缺评扣分 2016-12-06 16:13:04 +08:00
daiao 35fdf9a8a7 个人首页头部及其左侧导航(未完) 2016-12-06 09:36:13 +08:00
陈晓婷 39258f4ac5 Merge branch 'develop' into 'develop' 
课程相关bug修复；叠层回复的“回复”、“赞”的显隐



See merge request !32
 2016-12-02 10:14:07 +08:00
cxt 3f35b7f806 贴吧回复改版 2016-11-29 09:36:38 +08:00
daiao 2cbc7bca33 我的Issue导出功能 2016-11-28 16:11:52 +08:00
daiao 2c664dcd21 我的issue导出功能（未完） 2016-11-28 15:32:02 +08:00
guange c2629ebdc0 有几处相同的content key 2016-11-26 17:06:17 +08:00
cxt e202a7b99c 二级回复 2016-11-25 20:13:01 +08:00
cxt 8a52e136cf 点击展开回复 2016-11-25 18:01:50 +08:00
cxt ebda1d7d54 测试版课程列表报500 2016-11-25 16:17:02 +08:00
cxt 785f027a63 Merge branch 'cxt_course' into develop 2016-11-25 14:56:24 +08:00
cxt 8743460134 动态与详情的回复叠层调整 2016-11-25 09:59:03 +08:00
yuanke 7713fba2f8 个人留言列表优化 2016-11-24 14:30:24 +08:00
cxt eeacd76aa9 首页班级列表的归档 2016-11-22 10:27:56 +08:00
cxt 4388b7625e 首页班级列表的归档 2016-11-21 16:58:25 +08:00
daiao d65a062737 所有我的issue功能 2016-11-17 17:02:02 +08:00
daiao e956d20d6e 我的issue部分功能 2016-11-16 16:57:02 +08:00
daiao acffe8ec19 我的issue未完 2016-11-16 11:26:17 +08:00
huang 0adde560ba 我的issue路由修改及查询修改 2016-11-15 14:30:01 +08:00
huang 11f8656651 0 2016-11-15 11:20:30 +08:00
huang 5f21b63c41 我的issue框架搭建 2016-11-15 10:47:07 +08:00
huang 3561009efc Merge branch 'develop' into dev_newproject 2016-11-15 09:01:45 +08:00
cxt edf8ceed7c 取消收藏的班级和项目动态不显示 2016-11-14 16:37:42 +08:00
huang f08b04d645 My Issue未完 2016-11-14 16:06:54 +08:00
huang d1f9ce3ab2 课程中资源库导入不能用 2016-11-11 18:19:03 +08:00
huang 0f328c9c58 解决用户ID转换成用户名后引发的问题 2016-11-10 10:27:57 +08:00
cxt f921c8cccc 发布作业时默认教师优先、迟交扣分为0、缺评扣分为0 2016-11-04 18:54:51 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop 
Conflicts:
	db/schema.rb
 2016-10-27 17:33:28 +08:00
huang ec5645fc66 完成项目动态中样式别别的地方冲突问题 2016-10-27 14:57:12 +08:00
huang c4b32438ee 动态样式冲突问题 2016-10-27 11:16:51 +08:00
huang 6b8184ed49 issue模块新版二级回复ajax刷新 2016-10-21 13:27:41 +08:00
cxt bee1597167 删除的个人主页报500 2016-10-20 15:01:05 +08:00
cxt 269083c4a6 分组作业的评分设置 2016-10-20 14:24:07 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-19 18:11:02 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
cxt ce1da89e02 Merge branch 'cxt_replies' into develop 2016-10-14 16:18:43 +08:00
huang b9d87b1b29 Merge branch 'develop' into rep_quality 
Conflicts:
	public/stylesheets/css/project.css
 2016-10-14 15:43:45 +08:00
cxt 5f04baf572 博客动态回复显示：“展开更多”、“收起回复”点击无反应 2016-10-14 15:09:47 +08:00
cxt d2b6d81373 Merge branch 'cxt_replies' into develop 
Conflicts:
	app/views/blog_comments/show.html.erb
	app/views/blogs/_article.html.erb
	app/views/org_document_comments/show.html.erb
 2016-10-13 14:22:05 +08:00
cxt 5fb7da4681 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/css/public.css
 2016-10-13 14:17:54 +08:00
cxt b8296f3e7e 首页的课程列表显示缺漏 2016-10-13 14:08:20 +08:00
huang dd4d20011d 公共资源库显示优化 2016-10-13 09:43:53 +08:00
cxt a581f989c9 给messages、journals_for_messages、blog_comments、org_document_comments表增加root_id，优化平台的回复 2016-10-11 14:08:44 +08:00
huang 351ca6d074 Merge branch 'rep_quality' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-10-08 10:41:05 +08:00
cxt a9a53caa13 学生提交作品后，跳转至“作品列表”，而不是“作业信息” 2016-09-30 10:29:42 +08:00