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

1519 Commits

Author SHA1 Message Date
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