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

1904 Commits

Author SHA1 Message Date
cxt 71b5fe1273 Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/issues_controller.rb
	app/views/issues/_issue_replies.html.erb
	app/views/issues/_issue_reply_ke_form.html.erb
	db/schema.rb
 2016-07-21 14:31:43 +08:00
cxt 0146ac1f11 访问他人主页时，对于动态过滤按钮，“我的动态”应改为“他的动态”；但浏览自己的主页时，应该显示为“我的动态”。 2016-07-21 10:50:53 +08:00
cxt f3c95906d8 项目缺陷的二级回复 2016-07-21 10:30:48 +08:00
cxt 7853b8aa54 班级通知、项目新闻、帖子栏目通知的动态和详情页的二级回复， 二级回复代码的整合 2016-07-20 17:00:18 +08:00
Tim 1fc2bbd56a 作业资源库弹框，资源名称与上传者栏增加宽度限制 2016-07-19 09:17:20 +08:00
cxt fdf925a0b8 个人主页留言动态：如图回复当前用户自己的留言却不能删除，“展开回复”后又可删除了，刷新网页后又删除不了 2016-07-18 16:40:04 +08:00
cxt 8e3488132b 导入作业：公共题库中显示的却是我的题库，我的题库中显示的却是公共题库 2016-07-18 14:43:47 +08:00
Tim e966972750 Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/versions/index.html.erb
 2016-07-18 14:32:17 +08:00
cxt 9e5e7a75b0 编程作业关闭匿评后，老师点击模拟答题，却弹出匿评提示 2016-07-18 14:09:41 +08:00
cxt a9ee1d10cd 新增班级成员的消息通知，跳转至该班级的成员配置页面 2016-07-18 11:19:56 +08:00
cxt c9e0143fe8 作业动态的时间 2016-07-15 19:36:46 +08:00
cxt 48e5a0be7e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-15 17:38:56 +08:00
cxt fcc8a08138 课程列表的样式问题 2016-07-15 17:38:10 +08:00
huang 4c5052dce2 作业按更新时间排序 2016-07-15 17:28:57 +08:00
cxt 5b070b6acc 消息列表的html标签 2016-07-15 16:52:18 +08:00
cxt 1c967ce569 Merge branch 'rep_quality' into develop 
Conflicts:
	app/views/users/_user_message_system.html.erb
	app/views/users/_user_message_userfeedaback.html.erb
 2016-07-15 15:53:32 +08:00
cxt 11e0101f56 导航栏题库中 我的题库放在前面 2016-07-15 15:06:33 +08:00
cxt fd68479d72 课程/项目/组织资源库发送资源、问答区帖子发送、通知发送、新闻发送、动态中发送到课程改为班级 2016-07-15 11:02:53 +08:00
cxt b77779ca55 文章的二级回复和组织帖子的二级回复 2016-07-14 17:23:48 +08:00
huang 7da67350fd issue列表进入详情页面，弹出新页面 2016-07-14 15:31:25 +08:00
huang e98d7a213f 系统消息点击跳转列表定位 2016-07-14 15:23:16 +08:00
huang f7c9bc0a19 消息跳转定位 2016-07-14 15:04:58 +08:00
cxt e19efc1c8a 博客的二级回复 2016-07-14 14:44:47 +08:00
huang 3485d48163 Merge branch 'develop' into rep_quality 
Conflicts:
	app/controllers/quality_analysis_controller.rb
 2016-07-14 14:08:03 +08:00
huang 8c6fca87c9 项目动态中，新闻添加快捷操作，所有操作默认显示 2016-07-14 13:57:06 +08:00
Tim fdf147326c Merge branch 'develop' into cs_optimize_txz 2016-07-14 11:01:12 +08:00
cxt ded8f48d34 博客的二级回复 2016-07-13 15:20:39 +08:00
cxt c46fcc48b1 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/users/_join_course_course_message.html.erb
 2016-07-12 16:26:13 +08:00
cxt f0e456729e 过滤掉消息中的html 2016-07-12 16:21:30 +08:00
cxt 89819f5ccd 消息列表 2016-07-11 17:33:11 +08:00
huang 22745edb9b Merge branch 'rep_quality' into develop 2016-07-11 17:02:25 +08:00
huang 8b5a2ac1cb message 500 2016-07-11 16:59:37 +08:00
cxt b4e6561e50 Merge branch 'cxt_course' into develop 2016-07-11 15:16:27 +08:00
cxt 5d9bde3c95 课程发送资源到课程 2016-07-11 15:10:55 +08:00
Tim a0db221ffc Merge branch 'develop' into cs_optimize_txz 2016-07-11 13:57:04 +08:00
huang 0a001b4f76 message 500 for boliang 2016-07-11 11:29:15 +08:00
cxt 3362ebe321 线下作业 2016-07-08 18:22:59 +08:00
cxt cc4b24cdb9 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-07-08 13:18:46 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +08:00
huang ef8b127225 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
 2016-07-08 11:33:51 +08:00
yuanke 06f7594680 Merge branch 'yuanke' into develop 2016-07-08 09:15:55 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
 2016-07-07 15:14:11 +08:00
yuanke a732efa6c6 1.组织动态中去掉设为首页的文章动态 2.个人主页动态中去掉设为首页的博客动态并将 最上面的博客显示回复内容及可回复 2016-07-07 10:42:51 +08:00
Tim 0b764d0dfc RSide样式处理 2016-07-06 15:52:18 +08:00
Tim 75475b6058 个人主页，课程，项目样式更新 2016-07-06 15:43:48 +08:00
Tim 1658f78a7b Merge branch 'develop' into cs_optimize_txz 
Conflicts:
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/users/_user_resource_info.html.erb
 2016-07-05 15:38:56 +08:00
cxt 3ccdf7f9ae 课程问答区，项目讨论区的帖子消息通知应直接打开对应的帖子详情界面 2016-07-05 15:00:41 +08:00
cxt 2956b08f40 分组作业：去掉组员“追加附件”的入口 2016-07-05 10:32:46 +08:00
cxt 0dd7ef4460 帖子列表的回复数与实际不符 2016-07-04 14:45:50 +08:00
cxt 599cedaa18 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2016-07-04 14:15:56 +08:00