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

1796 Commits

Author SHA1 Message Date
yuanke 2ceef7d3e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 21:12:22 +08:00
yuanke ef49715b08 编程测试加个results为空判断 2016-03-25 21:11:13 +08:00
yuanke a58ba8080c 编程作业加个日志 2016-03-25 21:06:25 +08:00
huang c7c96e0c6a 公共资源附件名编辑问题 2016-03-25 20:37:32 +08:00
alan 16831e19d9 merge 晓婷的课程留言 2016-03-25 17:34:32 +08:00
yuanke 4c47dae88b Merge branch 'develop' into yuanke 2016-03-25 16:38:21 +08:00
huang dea1c13a64 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/migrate/20160324074942_add_index_to_forge_activities.rb
 2016-03-25 16:33:22 +08:00
huang cca570e75c 课程相关优化 2016-03-25 16:30:00 +08:00
alan 3b48b3add7 refactor cache 2016-03-25 16:26:33 +08:00
alan 46951f7af9 Merge branch 'develop' into alan_develop 
Conflicts:
	app/views/student_work/_student_work_list.html.erb
	app/views/users/_user_activities.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-25 16:16:55 +08:00
alan 4f5e083707 优化个人主页，缓存设置 2016-03-25 16:06:14 +08:00
yuanke 674b63d106 Merge branch 'develop' into yuanke 
Conflicts:
	app/views/student_work/_programing_work_show.html.erb
 2016-03-25 15:59:49 +08:00
huang e02ad85bbb 项目动态关联优化（主要优化查询次数） 2016-03-25 15:58:17 +08:00
huang 9ce39d2f4a Issue模块动态优化 2016-03-25 15:46:40 +08:00
cxt 46a05d1000 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 15:37:15 +08:00
yuanke dea947e9ce Merge branch 'develop' into yuanke 
Conflicts:
	db/schema.rb
	public/javascripts/application.js
	public/javascripts/homework.js
	public/stylesheets/new_user.css
 2016-03-25 14:58:17 +08:00
yuanke c6361406b5 代码评测超时优化 2016-03-25 14:43:51 +08:00
huang 9549d695f6 讨论区局部优化 2016-03-25 14:29:58 +08:00
alan aeb694a68e 修改《删除blog_comment时删除user_activities内容》 2016-03-25 13:57:00 +08:00
ouyangxuhua 7b24b053a5 Merge branch 'develop' into ouyang 2016-03-25 12:35:13 +08:00
alan 04b4823ac2 user_activities 加cache 2016-03-25 10:27:28 +08:00
ouyangxuhua 2d4f5284df 删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题 2016-03-24 17:03:51 +08:00
huang 9cbe719c5e 项目动态表添加索引 2016-03-24 16:44:54 +08:00
huang 88185b1f34 点击作品消息，作品展开 2016-03-24 15:04:50 +08:00
huang 77419dc2d4 Merge branch 'develop' into hjq_new_course 2016-03-24 14:00:45 +08:00
alan a0e11a787f 修改个人主页不能展开更多 2016-03-24 13:57:01 +08:00
ouyangxuhua 589f939bbd 消息类型“学生再次提交作业”中的链接，应该打开学生作品 2016-03-24 11:39:38 +08:00
huang f1ffd3852f Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-24 09:37:06 +08:00
huang 185ad829cd 项目访问速度优化 2016-03-24 09:36:46 +08:00
ouyangxuhua 1579a86f9f 老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示 2016-03-23 17:19:25 +08:00
alan a165657915 Merge branch 'develop' into hjq_new_course 2016-03-23 14:03:41 +08:00
cxt aa1cbcdf87 课程留言动态加入个人动态 2016-03-22 16:44:53 +08:00
huang e20fe85ddf 消息去掉tip 2016-03-21 18:16:50 +08:00
yuanke a10830c90f Merge branch 'develop' into yuanke 
Conflicts:
	public/stylesheets/new_user.css
 2016-03-21 14:40:47 +08:00
cxt 74e77bf347 题库的来源排序不可用 
题库的分布时间排序
 2016-03-18 16:23:24 +08:00
ouyangxuhua a1fbe8b886 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:33:17 +08:00
huang 8b09be83e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 15:18:31 +08:00
huang fc6210eada 资源导入，搜索条件中导入400问题 2016-03-18 15:17:49 +08:00
ouyangxuhua c64910d343 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 14:53:52 +08:00
cxt a482b76207 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 14:53:52 +08:00
cxt dc4a7ee2e6 Merge branch 'cxt_course' into develop 2016-03-18 14:53:43 +08:00
ouyangxuhua 5c22b23f3a Merge branch 'develop' into ouyangxuhua 2016-03-18 14:52:51 +08:00
cxt b1f3395bd1 修改作品描述框和名称框的提示文字 2016-03-18 14:45:42 +08:00
ouyangxuhua b5964fba0b 组织超链接问题 2016-03-18 14:44:39 +08:00
huang 2fe1100da6 去掉课程使者帖子中时间 2016-03-18 12:34:41 +08:00
ouyangxuhua 1eafad6468 鼠标经过用户头像显示用户信息后，持续显示用户信息半秒钟，以便用户及时操作用户信息 2016-03-18 10:05:31 +08:00
cxt 2466184d8a 编辑作业的时候，还要选择作业发布的课程不合理，影响体验 
编辑作业时layout根据来源而不同
 2016-03-17 17:34:29 +08:00
huang 1b0bcd0c05 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 16:37:24 +08:00
huang cefa6efc1b 项目动态中加入附件 2016-03-17 16:36:57 +08:00
cxt b8b34f7861 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-17 16:23:47 +08:00
cxt 368c70b14d Merge branch 'cxt_course' into develop 2016-03-17 16:23:38 +08:00
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-03-17 16:18:30 +08:00
cxt 10da3e1e53 题库样式调整 2016-03-17 16:11:04 +08:00
huang 7e0aa44b68 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-17 16:06:36 +08:00
huang 28cb1755d8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/files/_org_subfield_list.html.erb
	db/schema.rb
 2016-03-17 16:06:05 +08:00
cxt 6b8ae56ce4 Merge branch 'alan_develop' into develop 2016-03-17 16:04:06 +08:00
cxt d72aa3a93c Merge branch 'develop' into cxt_course 
Conflicts:
	app/controllers/homework_common_controller.rb
	app/views/student_work/show.js.erb
	public/javascripts/application.js
	public/stylesheets/base.css
	public/stylesheets/public_new.css
 2016-03-17 15:27:52 +08:00
huang 42d89c7ed0 课程导语发送这改成课堂使者 2016-03-17 15:12:28 +08:00
alan 8e41b19563 消息列表取消tip 2016-03-17 15:09:08 +08:00
cxt a8780be9b4 提交作品、提交作业、发布课程帖子、组织文章实现每隔10秒自动保存帖子 2016-03-17 15:03:34 +08:00
alan a4e2fd741e 删除issue，返回页面不变 2016-03-17 14:13:29 +08:00
huang ee40255d7e 资源库bytes改成b 2016-03-17 14:09:13 +08:00
huang 0a881f14e8 导入添加自动搜索 2016-03-16 17:06:11 +08:00
alan 4d82f0c959 在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》 2016-03-16 16:03:53 +08:00
alan 3b63071dee 修复《issue的展开和收起在属性表格的上面》 2016-03-16 15:12:50 +08:00
cxt 879f9a0ad5 对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天 2016-03-15 17:21:12 +08:00
cxt e97690e2f2 “导入作业”改为“从题库选用” 2016-03-15 16:47:57 +08:00
huang a10475fa65 公共资源删除、新建代码优化 2016-03-15 16:28:35 +08:00
huang 22ce591c36 资源库添加搜索过滤 2016-03-15 15:42:20 +08:00
ouyangxuhua fe0d31d9c4 1.用户信息中的额用户链接改成正确连接；组织资源文件名过长时省略显示 2016-03-15 14:17:06 +08:00
ouyangxuhua 098844a910 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/organizations/_org_course_news.html.erb
	app/views/organizations/_org_project_issue.html.erb
	app/views/organizations/_project_message.html.erb
	app/views/organizations/_show_org_document.html.erb
	app/views/users/_user_message_course.html.erb
 2016-03-15 13:40:33 +08:00
ouyangxuhua 2a46d60433 组织下的链接的host_name均使用Setting.host_name 2016-03-15 11:19:03 +08:00
huang 5681d329d6 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/controllers/news_controller.rb
	app/views/users/_user_message_userfeedaback.html.erb
 2016-03-15 11:12:24 +08:00
huang bf4116906f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/controllers/users_controller.rb
	public/stylesheets/public.css
 2016-03-15 11:09:11 +08:00
cxt 5476016b79 调整题库高度与资源库一致 2016-03-15 09:47:58 +08:00
huang 2b21213b7f 公共资源库，排序 2016-03-15 09:26:26 +08:00
cxt c770fd157c 题库：题目描述变窄，缺省文字：【尹刚提供】 2016-03-14 16:33:16 +08:00
cxt 3d1f7cc0a8 提交作品：作品标题设缺省值：作业名称+“的作品提交”。学生不改就使用缺省值 2016-03-14 15:02:37 +08:00
cxt 1aa5450e4a 题库支持按发布者、来源、类型的排序 2016-03-14 14:39:58 +08:00
cxt 7d2bb572b2 Merge branch 'yuanke' into develop 
Conflicts:
	app/controllers/student_work_controller.rb
	public/stylesheets/new_user.css
 2016-03-11 19:43:36 +08:00
cxt 12c60547ad 题库支持按引用数和发布时间排序 2016-03-11 18:06:43 +08:00
luoquan 901409ebb4 Merge branch 'yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
 2016-03-11 14:40:07 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
cxt 94c1e38066 分组作业动态中的“创建项目”更换颜色 2016-03-11 11:23:16 +08:00
luoquan a418c0937d Merge remote-tracking branch 'remotes/origin/yuanke' into luoquan 
Conflicts:
	public/assets/kindeditor/kindeditor.js
	public/assets/kindeditor/plugins/code/previewcode.css
 2016-03-11 10:21:59 +08:00
luoquan 7d70e63f8d 代码重置 2016-03-11 10:18:10 +08:00
ouyangxuhua eb3c0d9334 组织设置为公开后，允许游客下载选项变为可选；老师的提交作业消息不显示 2016-03-10 17:33:22 +08:00
huang 627580a9ac 标签问题（未完） 2016-03-10 16:25:39 +08:00
yuanke 7f7979e955 修改回复时可多次点击发送按钮的问题。 2016-03-10 15:12:16 +08:00
huang c947121e2b 消息不显示问题（未完） 2016-03-10 14:52:49 +08:00
ouyangxuhua f917e96a12 组织栏目中的链接的url更新 2016-03-10 12:47:10 +08:00
huang 3d2ba83c36 @消息问题修复 2016-03-09 17:22:16 +08:00
huang 5a4f422b1c 消息分页问题 2016-03-09 16:44:11 +08:00
huang 53e164048d Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-09 15:29:06 +08:00
huang 2a1eac02a9 Merge branch 'hjq_new_course' into szzh 2016-03-09 15:28:28 +08:00
huang b4800585e7 解决消息 信息500问题 2016-03-09 15:24:02 +08:00
ouyangxuhua 5d1d56fbb3 组织下链接改成https://www.形式 2016-03-08 16:44:03 +08:00
Tim 141c0be24f 上传资源弹窗样式调整 2016-03-08 15:50:01 +08:00
ouyangxuhua 4442d286ce 组织下的用户连接改成https://www.……形式 2016-03-08 15:20:38 +08:00
cxt ca094a13b5 优秀作品排行中，不允许访问的，就取消链接。老师设置了完全公开的作品，就有链接 2016-03-08 10:16:55 +08:00
cxt 64b6af6177 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-07 17:02:03 +08:00
cxt 91d000c8f3 编程作业：编程测试集的弹框中，多行却只显示一行 2016-03-07 17:01:10 +08:00
ouyangxuhua 2ea553e988 Merge branch 'ouyangxuhua' into develop 2016-03-07 16:15:13 +08:00
cxt f8ce6d48d3 模拟答题的返回按钮应该回到课程作业列表 2016-03-07 14:31:58 +08:00
cxt e30c26aa09 课程报500 2016-03-07 13:56:28 +08:00
ouyangxuhua a0363b5511 组织资源发送后，发送次数动态增加 2016-03-07 12:57:24 +08:00
ouyangxuhua 319f286a65 解决一下问题：1.组织的资源的引用计数不会增加；2.组织资源栏目中，文件的宽度不合适 2016-03-07 12:19:48 +08:00
huang bafa151c0d 0 2016-03-05 03:16:04 +08:00
cxt 782bbc775b 公共资源库的统计 2016-03-04 21:04:21 +08:00
huang de1c2e18c8 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-04 18:37:46 +08:00
huang 38fca02193 注释搜索 2016-03-04 18:36:42 +08:00
huang ae40a4ea61 公共资源相关功能 2016-03-04 18:22:22 +08:00
cxt 3deaa492b2 编辑作业时作业描述被解析了 2016-03-04 18:11:23 +08:00
cxt 4f3055c990 讨论区改为问答区，且放开课程的“问答区”，就是课外的用户也能在公开课内发帖或回帖。 2016-03-04 17:11:52 +08:00
cxt fd8b40a36e 对于编程作业，系统评分的前几名能否也显示出来 2016-03-04 16:53:36 +08:00
huang bbbf13084e 修改搜索功能，页面跳转 2016-03-04 16:05:58 +08:00
cxt 947e6ea469 作业--“禁用匿评”处增加提示语：匿评是同学之间的双盲互评过程：每个同学将评阅系统分配给他/她的若干个作品。 2016-03-04 16:00:20 +08:00
cxt d2920c64ea 题库作业发送到课程后增加提示 2016-03-04 15:12:03 +08:00
cxt 6ca702eb2c 题库发送的课程列表中不包含当前作业所在的课程 2016-03-04 13:18:43 +08:00
cxt 8aff404f0c 题库过滤作业的搜索 2016-03-04 11:37:14 +08:00
cxt b333c40ce0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/public.css
 2016-03-04 11:11:25 +08:00
cxt e2ff348075 题库的作业过滤 2016-03-04 11:07:53 +08:00
cxt 0cd536fcc9 题库增加发布者姓名搜索 2016-03-04 10:34:04 +08:00
huang 596d4e17e9 解决样式冲突 2016-03-04 09:57:54 +08:00
huang 97e6299a2b Merge branch 'hjq_new_course' into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
 2016-03-04 09:33:38 +08:00
huang 95346bb419 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/layouts/_logined_header.html.erb
	public/stylesheets/public.css
 2016-03-04 09:32:49 +08:00
huang ba9b22fbe1 公共资源，删除、重命名 2016-03-03 23:56:06 +08:00
huang 3dacf900d5 修改导入公共、我的资源 2016-03-03 23:24:25 +08:00
huang 5cf198c61a 课程教师、学生列表添加成员管理入口，项目成员列表入口 2016-03-03 17:59:36 +08:00
cxt 8e5abe997a 已禁用匿评的作业还显示匿评截止时间不合适 2016-03-03 17:39:08 +08:00
huang 8815e99db5 资源上传跳转问题 2016-03-03 17:25:52 +08:00
cxt 050257e885 作业添加挂起的状态 2016-03-03 17:24:07 +08:00
huang 5fd36c0e78 课程、项目、组织资源导入 2016-03-03 17:15:47 +08:00
cxt 9b573248d8 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/views/users/_show_user_homework_form.html.erb
	app/views/users/_show_user_homeworks.html.erb
 2016-03-03 17:07:35 +08:00
cxt f0d7542ac6 个人题库和公共题库 2016-03-03 17:04:38 +08:00
huang 3368680e49 课程、项目、组织添加导入资源功能 2016-03-03 10:38:37 +08:00
huang 22cbbc2476 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-02 18:41:46 +08:00
huang a0ef85f4da 导出样式 2016-03-02 18:41:20 +08:00
Tim f51d16c538 资源库样式调整 2016-03-02 18:20:36 +08:00
huang 21244a5657 资源库导入功能 2016-03-02 17:46:10 +08:00
huang c0077b7c9d 公共资源/我的资源JS实现 2016-03-02 16:54:07 +08:00
huang b3fea3e229 资源库代码封装 2016-03-02 11:30:19 +08:00
huang 8edaa9d2bd 资源库 2016-03-01 17:33:44 +08:00
Tim 11592bdbcc 导入题库题目弹框样式更改 2016-03-01 17:28:49 +08:00
cxt 072300331b 编程测试集的输入输出添加序号 2016-02-29 17:05:11 +08:00
cxt 0b6521c921 禁用匿评的作业动态仍然显示缺评扣分 2016-02-26 16:37:02 +08:00
cxt c93b4d109a 作业动态添加子菜单：公开作品/取消公开 2016-02-25 16:18:24 +08:00
cxt c6e7e2e83b 模拟答题页面增加返回按钮，页面的layout改成课程相关 2016-02-25 10:23:38 +08:00
Tim b376c5c6cd 版本库和问题跟踪的function样式冲突 2016-02-24 15:47:30 +08:00
ouyangxuhua 5c9d8954ec Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-23 16:20:07 +08:00
ouyangxuhua f785277d42 解决回复框工具栏乱码、组织子域名等问题 2016-02-23 16:17:14 +08:00
cxt 070af9ad73 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-23 15:22:55 +08:00
cxt e4bf35a1b8 个人留言的回复不能自动刷新 2016-02-23 15:22:44 +08:00
ouyangxuhua 4247ab4575 Merge branch 'ouyangxuhua' into develop 
Conflicts:
	db/schema.rb
 2016-02-23 13:36:05 +08:00
ouyangxuhua c91ef44570 组织子域名：所有子域名保存到secdomains表，将组织表中的子域名迁移到secdomains表中，并修改相应的代码 2016-02-23 12:52:04 +08:00
huang 6f9d4eccbe 解决合并引起的问题 2016-02-20 17:17:12 +08:00
huang 3fda270a66 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/org_document_comments/edit.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-02-20 16:58:20 +08:00
ouyangxuhua a4ca676ccb Merge branch 'szzh' into ouyangxuhua 
Conflicts:
	app/views/org_document_comments/edit.html.erb
	app/views/users/search_user_course.js.erb
	app/views/users/search_user_org.js.erb
	app/views/users/search_user_project.js.erb
 2016-02-20 16:49:19 +08:00
huang 75214f0211 新课导语修改：导语的时候显示trustie信息 2016-02-20 16:45:45 +08:00
huang 534d93de77 弹框位置调整 2016-02-20 10:59:49 +08:00
huang aa22a253ba “发送至”弹框飘动问题 2016-02-20 09:45:37 +08:00
huang 1c4e3545c7 资源弹框剧中 2016-02-19 14:16:26 +08:00
huang db1bffd7db 资源弹空白框问题 2016-02-19 13:23:32 +08:00
guange 10eeeaa95c 弹出框居中 2016-02-03 23:30:07 +08:00
cxt 8b5896ae1c 弹框的拖动 2016-02-03 13:32:05 +08:00
cxt 0a0d67642a 导入作业 2016-02-03 12:17:45 +08:00
cxt cb2fdc7388 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/words/create_reply.js.erb
 2016-02-02 15:57:23 +08:00
cxt 6e93a5af33 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/users/user_import_homeworks.js.erb
	db/schema.rb
 2016-02-02 15:55:07 +08:00
ouyangxuhua 0b5aa4b81e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-02 15:53:14 +08:00
ouyangxuhua d820977d5d Merge branch 'develop' into ouyang 
Conflicts:
	app/views/blog_comments/show.html.erb
	app/views/courses/syllabus.html.erb
	app/views/messages/_org_subfield_show.html.erb
 2016-02-02 15:51:18 +08:00
cxt d42f144f23 作业、组织帖子描述框的自动增高 2016-02-02 15:50:28 +08:00
cxt ea8e73ad54 弹框的拖拽 2016-02-02 15:47:12 +08:00
Tim f3bcb3ca47 导入题库弹框位置调整 2016-02-02 15:23:23 +08:00
Tim 619144224e 文本框格式问题 2016-02-02 10:08:04 +08:00
ouyangxuhua cdd997e45e kindeditor回复框修改 2016-02-01 14:50:45 +08:00
Tim d092891b2a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-01 10:41:30 +08:00
ouyangxuhua 25e32f09e1 Merge branch 'develop' into ouyang 
Conflicts:
	app/views/words/create_reply.js.erb
 2016-02-01 10:14:04 +08:00
cxt 265359cd74 发布作业时作业类型的切换 2016-01-29 18:17:27 +08:00
ouyangxuhua dc3278274d 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
Tim 55fddbcabe Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-29 16:52:14 +08:00
Tim 674a8e0035 单词折行问题 2016-01-29 16:16:02 +08:00
cxt da81fb533e Merge branch 'ouyang' into szzh 2016-01-29 15:45:47 +08:00
cxt b5cf138f43 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/student_work/_programing_work_show.html.erb
	db/schema.rb
 2016-01-29 15:44:26 +08:00
cxt d3ba23bc64 课程的作业列表增加搜索按钮 2016-01-29 15:37:03 +08:00
ouyangxuhua 280f679b0c 1.调整项目中的问题快捷编辑的宽度；2.https://www.trustie.net/manual/feedback链接到帮助中心；3.编辑框显示更多选项 2016-01-28 16:49:25 +08:00
cxt c942c843b9 导入作业增加引用次数 2016-01-28 16:27:46 +08:00
cxt a613b58b46 编程作业弹框的高度设置 2016-01-28 11:08:16 +08:00
cxt 8cc87c007f 导入作业添加作业类型 2016-01-28 09:51:05 +08:00
cxt ec41cd4318 导入共享题库中的作业 2016-01-27 17:26:57 +08:00
guange d2c6d9272c 输出结果匹配\r问题 2016-01-27 11:35:27 +08:00
guange d8ef2f0965 个人留言中的at启用 2016-01-26 18:24:15 +08:00
ouyangxuhua fbff28d70e Merge branch 'develop' into dev_hjq 2016-01-26 11:05:25 +08:00
ouyangxuhua f3dcd4ed09 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-26 10:59:44 +08:00
ouyangxuhua 63d1d3a8e7 项目动态中，只要是项目成员就显示编辑issue多属性界面 2016-01-26 10:59:28 +08:00
ouyangxuhua dda64245b3 解决以下问题：1.编辑个人首页后，返回至个人动态；2.个人名片中，正确显示个人信息；3.同意申请子域名后，显示已同意申请。 2016-01-26 10:35:54 +08:00
cxt b6e13340e5 个人留言的删除功能 2016-01-25 15:33:50 +08:00
ouyangxuhua 1607508887 增加将帖子发送至课程、项目的功能 2016-01-25 14:19:39 +08:00
Tim f099611d7a 问题跟踪样式更改 2016-01-25 11:25:43 +08:00
cxt d386b2ff84 留言页面的“展开更多” 2016-01-22 22:37:47 +08:00
cxt 435f81a422 关联项目的更新时间 2016-01-22 21:47:59 +08:00
cxt bbdced9bc1 留言页面的样式修改 2016-01-22 21:41:17 +08:00
cxt 4530e7896a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 20:55:31 +08:00
cxt 8a2a1d2bc9 Merge branch 'szzh' into develop 2016-01-22 20:55:18 +08:00
cxt fc0b589760 Merge branch 'cxt_course' into szzh 2016-01-22 20:54:14 +08:00
cxt 3de8687440 留言页面的动态内容不生成链接，留言回复的样式更改 2016-01-22 20:11:49 +08:00
huang f2d93c0b72 修改issue编辑权限 2016-01-22 20:02:18 +08:00
huang 16cb4add09 issue局部刷新属性问题 2016-01-22 18:48:40 +08:00
cxt 6ae7da99be 帖子、博客、通知、文章详情页面的单词折行 2016-01-22 18:33:43 +08:00
huang e063470a57 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:30:07 +08:00
huang ea6a78893f Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2016-01-22 17:29:33 +08:00
cxt a96d8ce5a4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-22 17:29:29 +08:00
huang faf1fcaf22 issue回复局部刷新 
附件浏览问题
昵称改成登录名
 2016-01-22 17:27:21 +08:00
ouyangxuhua b6219c149a 解决一下bug:1.通知不能回复；2.组织通知作者不能编辑和删除； 2016-01-22 16:10:05 +08:00
huang edd198e91f issue刷新 2016-01-22 14:21:17 +08:00
cxt f7be78efc7 关联项目的更新时间包含项目的提交时间 2016-01-22 11:10:35 +08:00
cxt 6789693fc7 已评分作品超过5个时，作业优秀作品排行显示“更多” 2016-01-22 10:17:00 +08:00
ouyangxuhua 8ef3018adc issue局部刷新使用update,方式是put 2016-01-22 09:41:05 +08:00
huang 42cc8bc69e issue属性刷新 2016-01-22 09:30:52 +08:00
huang 448a412abf issue详情页面在 user动态、project动态中修改 2016-01-21 17:29:46 +08:00
ouyangxuhua 594ce8a304 修改几个bug 2016-01-21 16:57:13 +08:00
huang e2fc88e3d1 课程讨论区样式混乱的问题 2016-01-21 16:14:39 +08:00
ouyangxuhua 600f5de32e 个人动态进入个人博客编辑后，跳转到个人首页 2016-01-21 16:11:06 +08:00
huang 61e67fa7f4 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/views/users/_course_message.html.erb
	app/views/users/_project_issue.html.erb
	db/schema.rb
 2016-01-21 16:10:29 +08:00
ouyangxuhua b8ae62db84 Merge branch 'szzh' into dev_hjq 2016-01-21 15:32:18 +08:00
cxt 99cda66d00 编程作业：每次提交了测试集后，页面都会跳到作业页面的最底端，还得手动翻到页面最顶端，再点“发送” 2016-01-21 15:02:12 +08:00
cxt 5672b029fe 导入作业加提示语 2016-01-21 14:50:16 +08:00
ouyangxuhua c303f7ff3f 将分享的js方法统一，分享文件、通知等均可复用 2016-01-21 14:33:31 +08:00
cxt 247924af26 动态内容显示不全 2016-01-21 11:24:26 +08:00
ouyangxuhua ece9f9dc6f 项目新闻使用方块样式 2016-01-21 10:33:53 +08:00
cxt 1ff244ad98 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-01-20 18:38:00 +08:00
cxt 3b180aca90 用户个人留言页面的改版 2016-01-20 18:37:47 +08:00
huang 01016c67a9 issue属性局部刷新 2016-01-20 18:28:27 +08:00
Tim c7edf0d73b 弹框样式修改 2016-01-20 17:55:20 +08:00
huang e1a84de213 Merge branch 'cxt_course' into hjq_new_course 
Conflicts:
	app/models/course.rb
	public/stylesheets/courses.css
 2016-01-20 17:05:28 +08:00
ouyangxuhua a487d814cf 通知分享功能实现 2016-01-20 16:24:14 +08:00
Tim ffba281de5 弹框蓝色边框与关闭键替换 2016-01-20 16:03:28 +08:00
cxt b64fc1771d Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-20 09:27:29 +08:00
cxt 6e56a0706a 动态描述中的单词折行 2016-01-19 16:53:34 +08:00
cxt 8e9c4bab6b 赞增加tip 2016-01-19 10:08:28 +08:00
huang b93b86b9a0 创建课程发送board 2016-01-18 17:16:33 +08:00
cxt 7f7d0ac6f7 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/layouts/base_courses.html.erb
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-18 17:12:56 +08:00
cxt c5935a6a46 博客动态添加点赞 2016-01-18 15:52:38 +08:00
cxt 020135cbc2 作业动态显示优秀作品、关联项目的样式修改 2016-01-18 10:13:31 +08:00
huang eecdc26b2f Merge branch 'cxt_course' into develop 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-15 15:42:36 +08:00
cxt 902cfdcbe9 课程/项目的创建动态不需要显示更新时间 2016-01-15 10:29:55 +08:00
cxt c49a290d56 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_user_homework_detail.html.erb
 2016-01-15 10:24:37 +08:00
cxt 0be6e36020 缺陷、通知、个人留言动态的点赞 2016-01-14 21:07:05 +08:00
cxt 25cc959576 Merge branch 'szzh' into develop 
Conflicts:
	app/views/layouts/_user_courses.html.erb
	app/views/org_subfields/show.html.erb
	app/views/organizations/_subfield_list.html.erb
	app/views/users/_resource_share_for_orgs.html.erb
 2016-01-14 18:22:57 +08:00
ouyangxuhua 6b7ce68e4a 各种bug解决 2016-01-14 17:52:48 +08:00
cxt 58c96a0df0 作业动态的点赞 2016-01-14 16:15:40 +08:00