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

2008 Commits

Author SHA1 Message Date
cxt 153e02c4fa 消息列表报500 2016-08-09 10:39:32 +08:00
cxt 90e480f7e9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-08-05 18:52:39 +08:00
cxt 5b8883960b Merge branch 'cxt_course' into develop 2016-08-05 18:52:09 +08:00
cxt d3db6719eb “我的作业”中编辑作业不跳转到“题库”，而是返回到“我的作业” 2016-08-05 18:41:32 +08:00
Tim cd30f94d72 题库发送预览弹框位置及可拖拽js更新 2016-08-05 18:01:11 +08:00
cxt e7e873e0df Merge branch 'dev_shcool' into develop 
Conflicts:
	app/helpers/users_helper.rb
 2016-08-05 16:32:10 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
cxt 0d86a28c54 我的作业 2016-08-05 16:12:53 +08:00
cxt 6c7b53f7d4 首页左侧栏 2016-08-04 11:05:34 +08:00
daiao 7f62de59e1 优化周二代码审查的代码 2016-08-03 17:36:04 +08:00
cxt f262447ff1 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/user_homeworks.html.erb
 2016-08-03 15:01:43 +08:00
cxt cecf917764 从题库选用作业时增加提示：“您选中的题是“我收到的作业”，不能选用” 2016-08-03 15:00:16 +08:00
Tim a5fe620452 题库翻页居中对齐 2016-08-03 14:57:02 +08:00
cxt bae775ec34 题库的搜索调整 2016-08-03 14:06:47 +08:00
cxt acc3ba121f 测试集的显示、新版分页 2016-08-03 13:46:59 +08:00
cxt 718b13e6c1 新版题库 2016-08-03 11:12:55 +08:00
daiao 5f969c6593 单位审核相关Bug修复 2016-08-03 10:36:03 +08:00
huang 94b36e227c 申请加入项目消息刷新，同时更新其它管理员的消息状态 2016-08-02 13:03:33 +08:00
daiao fc1fc0bd7d 单位审核bug修复 2016-08-01 15:44:18 +08:00
daiao 5272f20de8 单位审核bug的修复 2016-08-01 13:56:37 +08:00
cxt 87e3707b52 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:54:17 +08:00
cxt 0ac906a5cf 消息列表报500 2016-07-29 23:54:10 +08:00
daiao 6ea829131b 单位列表发送消息样式调整 2016-07-29 23:48:12 +08:00
daiao 15227907ea Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 23:23:11 +08:00
daiao db690bedab 单位名称列表缺陷修复 2016-07-29 23:22:32 +08:00
huang 21eed9ebb3 去掉同意拒绝“：” 2016-07-29 23:03:18 +08:00
cxt 23bb010315 课程列表的资源数显示不对 2016-07-29 22:49:39 +08:00
daiao 911a769670 Merge branch 'develop' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
 2016-07-29 22:05:56 +08:00
cxt 98a2ebd682 Merge branch 'cxt_course' into develop 2016-07-29 21:54:33 +08:00
cxt 4a800b67d8 消息列表报500 2016-07-29 21:53:00 +08:00
daiao d6178ec7dd 管理员界面单位申请 2016-07-29 21:45:52 +08:00
cxt 04b9c35a05 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-29 21:41:26 +08:00
cxt 807db1ac40 课程角色申请链接的样式 2016-07-29 21:41:19 +08:00
huang 847cae6d41 Merge branch 'develop' into rep_quality 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 21:39:00 +08:00
huang f857ceab32 消息中项目添加title 2016-07-29 21:07:15 +08:00
huang 8d625eff5e 修改方式就用户图像显示 2016-07-29 21:04:01 +08:00
daiao 3251890c91 Merge branch 'rep_quality' into dev_shcool 
Conflicts:
	app/models/applied_message.rb
	db/schema.rb
 2016-07-29 20:52:18 +08:00
huang 643b06484b 消息表添加字段 2016-07-29 20:50:55 +08:00
daiao 430a93e4b2 单位名称列表功能代码 2016-07-29 20:48:36 +08:00
cxt e3d538c3fa Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
	db/schema.rb
 2016-07-29 19:39:42 +08:00
huang 60417b2db7 项目邀请消息样式问题 2016-07-29 19:30:53 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00
huang c07677ef99 项目邀请框架 拒绝消息 2016-07-29 14:49:37 +08:00
cxt a1a2b3dd33 Merge branch 'rep_quality' into cxt_course 
Conflicts:
	db/schema.rb
 2016-07-29 14:36:18 +08:00
daiao 50ec127c5b 单位名称列表功能 2016-07-28 20:01:22 +08:00
huang a8fa4a55e3 项目申请消息发送 2016-07-28 16:22:33 +08:00
cxt a1149c1104 班级列表的公开私有 2016-07-27 14:07:16 +08:00
huang 43cb2a0d18 单位申请消息显示 2016-07-27 11:33:54 +08:00
cxt 4422bb1bc0 课程列表中的私有班级不可访问 2016-07-27 10:11:00 +08:00
cxt 76eca76728 作业发布时资源库的提示修改 2016-07-27 09:39:42 +08:00
cxt a0f2f518cf 回复他人的博客首页不应跳到自己的博客首页 2016-07-26 17:45:59 +08:00
cxt feb45a07bf 课程列表分为我创建的课程和我加入的课程 2016-07-26 16:45:36 +08:00
cxt 0564ddb6ea 课程大纲的回复 2016-07-25 13:56:26 +08:00
cxt 11c9fba7e7 提示信息修改 2016-07-22 18:58:41 +08:00
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