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

4106 Commits

Author SHA1 Message Date
huang a9412b959e 动态一致问题 2016-04-01 11:54:58 +08:00
huang 25da925497 课程列表显示内容统一 2016-04-01 11:38:20 +08:00
huang 92a08dc606 作业500问题 
admin组织编辑500问题
 2016-04-01 09:37:31 +08:00
huang 4cca290592 组织编辑500问题 
作业列表500问题
 2016-04-01 09:33:50 +08:00
huang 10371e8bdd 添加附件图片功能 2016-04-01 00:27:34 +08:00
huang ebb2f30f3b 配置完点确定，自动跳转 2016-03-31 19:14:58 +08:00
huang 4797cbe65d 模式默认选中 2016-03-31 19:09:11 +08:00
huang 756a2db4aa 组织配置样式问题 
链接more空白问题
 2016-03-31 19:04:31 +08:00
huang 6af8c48d3b Merge branch 'hjq_beidou' into develop 2016-03-31 17:06:30 +08:00
huang f662bfa40b 组织科配置 2016-03-31 17:06:00 +08:00
huang 1ccb3a2c41 Merge branch 'hjq_beidou' of http://git.trustie.net/jacknudt/trustieforge into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-31 15:25:24 +08:00
huang c6f6030e10 组织新样式 2016-03-31 15:25:02 +08:00
cxt 893fad2b48 组织配置里的栏目 “排列做成可编辑的” 2016-03-31 15:21:40 +08:00
huang da1438b04e Merge branch 'hjq_beidou' into develop 2016-03-30 19:34:03 +08:00
huang 5621f01284 权限访问控制 2016-03-30 19:31:43 +08:00
huang 8f43341f81 新建组织为空的情况 2016-03-30 19:17:29 +08:00
huang 7c55356ace 组织新界面修改 2016-03-30 17:22:23 +08:00
linchun d98eb8748e 修改管理员界面作业列表的截止时间为作业发布时间，并且按时间倒序排列 2016-03-30 14:17:12 +08:00
huang f2106d0045 more链接添加，区分两种模式 2016-03-29 20:33:16 +08:00
huang 2728cccd41 Merge branch 'develop' into hjq_beidou 2016-03-29 16:54:44 +08:00
alan 88a4b8ce6c Merge branch 'alan_develop' into develop 2016-03-29 16:44:06 +08:00
alan 200561da92 修改《私有资源公共资源中不显示》 2016-03-29 16:43:14 +08:00
yuanke be1351a4d8 Merge branch 'yuanke' into develop 2016-03-29 15:56:02 +08:00
yuanke ef5d8abf38 修改编程作业提示服务器出错的BUG 2016-03-29 15:54:44 +08:00
huang 80cd5089a4 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-03-29 13:51:46 +08:00
ouyangxuhua 2275b367f4 在organization控制器的show方法添加layout 2016-03-29 13:22:18 +08:00
alan eb1c6ccf85 Merge branch 'alan_develop' into develop 
Conflicts:
	app/views/users/_resource_share_for_orgs.html.erb
	app/views/users/_resource_share_for_project_popup.html.erb
	app/views/users/_resource_share_popup.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-03-29 11:36:49 +08:00
huang b80bc98fcb 组织首页 2016-03-29 11:31:58 +08:00
cxt d1cb44cff7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-29 10:39:51 +08:00
cxt 1daf620ed1 新建作品点取消时跳到我的作业页面 2016-03-29 10:39:44 +08:00
ouyangxuhua a69997f6c7 Merge branch 'develop' into ouyangxuhua 2016-03-29 10:21:29 +08:00
alan dfe9cb0c68 Merge branch 'develop' into alan_develop 2016-03-29 10:16:30 +08:00
alan 90fd52970b fix bugger on 资源区 2016-03-29 10:15:18 +08:00
yuanke 213cf48c09 编程的输出和结果每行尾部的空格才用别的符号代替,中间的空格不管 2016-03-29 09:02:54 +08:00
alan 395fb8fae6 修改pagination,资源区bug 2016-03-28 22:37:01 +08:00
huang b8463fcca5 北斗 2016-03-28 16:51:58 +08:00
huang 74a4e80795 Merge branch 'ouyangxuhua' into hjq_beidou 2016-03-28 15:11:37 +08:00
Tim 406bb7930c Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange 
Conflicts:
	public/javascripts/wechat/wechat-dev.js
 2016-03-28 14:47:11 +08:00
huang 4b6b5504ca 北斗框架（未完） 2016-03-28 14:11:40 +08:00
ouyangxuhua f4b4bf40de 增加显示组织显示模式字段，并且在新建组织和配置组织中能够选择 2016-03-28 11:24:31 +08:00
huang 326730f6b1 北斗框架 2016-03-28 10:39:09 +08:00
guange 60931dde6a 添加获取openid的功能 2016-03-26 15:52:14 +08:00
yuanke f217c9097a 全部正确需要提示是否提交 2016-03-26 15:44:28 +08:00
yuanke 88ba2bf556 编译错误处理 2016-03-26 14:59:51 +08:00
yuanke 5116d75eb7 编程作业空格用□表示 2016-03-26 14:48:57 +08:00
yuanke e62ee2eade 修改评测问题 2016-03-26 13:44:13 +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
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
ouyangxuhua 9f8ad41533 Merge branch 'ouyangxuhua' into develop 2016-03-25 15:42:37 +08:00
cxt 46a05d1000 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-25 15:37:15 +08:00
ouyangxuhua b581a13736 Merge branch 'develop' into ouyangxuhua 2016-03-25 15:32:38 +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
alan 357c60d42e Merge branch 'hjq_new_course' into alan_develop 2016-03-25 09:36:17 +08:00
alan 7108e6d763 减少数据库查询字段 2016-03-25 09:22:05 +08:00
ouyangxuhua 2d4f5284df 删除的课程、项目不能被关联到组织；组织名称长度限制；组织栏目添加帖子加上栏目名称；编辑组织时，如果组织名称没变，就不需要提示；学生回复老师的作业留言，打开后，显示该学生作业；新增、编辑组织文章，需要验证标题 2016-03-24 17:03:51 +08:00
huang 88185b1f34 点击作品消息，作品展开 2016-03-24 15:04:50 +08:00
huang 1330f02db8 项目创建的动态以多态形式存入forge_activities 2016-03-24 12:59:03 +08:00
huang d6f81c8978 课程讨论区优化 2016-03-24 10:41:08 +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
alan 49026f0438 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-23 00:05:21 +08:00
alan 9273e37a5b 优化SQL查询：1，members与users表关联查询； 2，blogs表单查询 2016-03-23 00:04:53 +08:00
cxt aa1cbcdf87 课程留言动态加入个人动态 2016-03-22 16:44:53 +08:00
huang 12efbcb9ae Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-22 15:07:25 +08:00
huang 7967066b05 附件添加动态发送方式改变 2016-03-22 15:06:54 +08:00
ouyangxuhua 675b1ad403 1.组织配置中，输入组织名字、子栏目域名目录后，自动变成小写字母；2.将所有子域名及域名目录改成小写；3.组织配置中，修改子栏目时，如果没有点确定，输入框的内容保持不变。 2016-03-22 13:51:19 +08:00
huang 478311128d 优化project_controller show方法 2016-03-22 12:42:53 +08:00
huang 341308658d 优化项目消息更新代码 2016-03-22 10:48:37 +08:00
guange fbe1b2dac2 Merge branch 'guange_dev' into weixin_guange 
# Conflicts:
#	Gemfile
#	db/schema.rb
 2016-03-21 18:17:39 +08:00
huang e77a891bc6 消息查询语句优化，添加索引 2016-03-21 16:36:25 +08:00
guange 6ae4cd0767 merge 2016-03-21 16:02:30 +08:00
linchun 6284b8d4f9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-18 16:57:59 +08:00
guange 59923dfb03 merge 2016-03-18 16:38:21 +08:00
cxt 74e77bf347 题库的来源排序不可用 
题库的分布时间排序
 2016-03-18 16:23:24 +08:00
huang 2793a9a874 0 2016-03-18 15:39:39 +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
cxt 9917e802cb 课程推荐的资源统计 2016-03-18 15:15:25 +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
cxt e34f2e45db 管理员界面的课程列表和项目列表分页 2016-03-18 14:53:06 +08:00
linchun d3635067b7 Merge remote-tracking branch 'remotes/origin/develop' into linchun 2016-03-18 13:01:39 +08:00
linchun 66a7827eb2 组织列表增加分页功能，学校列表调整分页 2016-03-18 12:55:55 +08:00
cxt 24318e3d6b 题库的刷新 2016-03-18 12:47:25 +08:00
linchun f8a88767c0 管理员用户列表增加单位信息 2016-03-18 12:44:16 +08:00
huang 4876e6669a 课程附件局部刷新 2016-03-18 11:04:43 +08:00
cxt 119b12349b 作品名称的缺省值为 作业名称+的作品提交(可修改) 若学生不修改则保存为 作业名称+的作品提交 2016-03-18 10:56:35 +08:00
huang 4766abab7f 下载行为添加ID判断 2016-03-18 09:59:39 +08:00
huang b262e1b432 完成下载行为记录 2016-03-18 09:58:47 +08:00
cxt 2466184d8a 编辑作业的时候，还要选择作业发布的课程不合理，影响体验 
编辑作业时layout根据来源而不同
 2016-03-17 17:34:29 +08:00
huang 79767f4bae 用户行为记录 2016-03-17 17:22:07 +08:00
cxt c73637a4ca 作业列表按作业发布时间排序 2016-03-17 16:42:10 +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
ouyangxuhua 093c777b23 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/users/_user_message_course.html.erb
 2016-03-17 16:18:30 +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
linchun 52af5e4303 修复了管理员界面多个列表的题目问题 2016-03-17 15:05:14 +08:00
huang 84470af2ff 删除的课程和项目不在发送中显示 2016-03-17 14:47:14 +08:00
alan a4e2fd741e 删除issue，返回页面不变 2016-03-17 14:13:29 +08:00
huang 7ff946e488 课程资源库提供历史版本下载 2016-03-17 12:37:05 +08:00
huang 0a881f14e8 导入添加自动搜索 2016-03-16 17:06:11 +08:00
alan 4d82f0c959 在个人动态、项目动态以及项目问题跟踪页面《issue动态要右上角显示功能菜单》 2016-03-16 16:03:53 +08:00
linchun 34c9f54510 完成了管理员界面学校列表 2016-03-16 15:24:41 +08:00
huang 064dc81ed6 解决公共资源删除资源后统计数字不减少的问题 
（增加删除回调）
 2016-03-16 13:48:02 +08:00
ouyangxuhua ea6de1407e Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
 2016-03-16 12:36:15 +08:00
alan 050a266985 Merge branch 'FX-alan-message-access-slow' into alan_develop 2016-03-16 11:17:35 +08:00
ouyangxuhua 9bac560906 超级管理员有编辑和删除博客的权限 2016-03-16 10:00:21 +08:00
huang 9aab10c05a 代码更新 2016-03-15 17:29:37 +08:00
cxt 879f9a0ad5 对已发布的作业截止时间进行调整时,如果作业截止时间大于等于匿评开始时间且匿评还未开启则匿评开始时间和结束时间都相应往后推迟7天 2016-03-15 17:21:12 +08:00
linchun 69ec475752 组织列表时间倒序排列 2016-03-15 16:59:32 +08:00
huang a10475fa65 公共资源删除、新建代码优化 2016-03-15 16:28:35 +08:00
linchun 7d5a5f1de2 完成项目资源列表中的排序（资源大小，上传时间，下载次数） 2016-03-15 16:14:53 +08:00
linchun 3fcf192430 完成了课程资源列表的排序（上传时间，资源大小，下载次数） 2016-03-15 15:59:49 +08:00
huang 22ce591c36 资源库添加搜索过滤 2016-03-15 15:42:20 +08:00
linchun d3ed89d87e sort 2016-03-15 15:23:43 +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
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
ouyangxuhua 2899f29b5f Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-14 17:29:06 +08:00
huang 7c624cd571 公共资源只包括公开资源 2016-03-14 16:35:18 +08:00
ouyangxuhua a2e6f0ee5f 1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示 2016-03-14 15:39:45 +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 98f7ad19f6 Merge branch 'linchun' into develop 2016-03-11 19:34:33 +08:00
cxt 7f302305ff Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-11 19:31:22 +08:00
cxt 46d22980c9 Merge branch 'cxt_course' into develop 2016-03-11 19:31:06 +08:00
guange 45c51ef8db merge 2016-03-11 18:51:41 +08:00
guange 24a278d7d6 加上atall 2016-03-11 18:50:37 +08:00
cxt 12c60547ad 题库支持按引用数和发布时间排序 2016-03-11 18:06:43 +08:00
linchun 8c145c9d39 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-11 17:25:30 +08:00
cxt e02bde6f65 作品列表支持按学生姓名和学号排序 2016-03-11 16:17:51 +08:00
Tim 45f1cfa477 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-03-11 15:51:59 +08:00
huang 8079254089 首页增加访问统计 2016-03-11 15:51:45 +08:00
huang c18634be86 课程通知。新闻代码优化 2016-03-11 15:21:40 +08:00
luoquan 1900a824e8 0 2016-03-11 14:39:17 +08:00
huang 47ca79c317 news消息已读修改 2016-03-11 10:49:17 +08:00
alan 89438364cf Merge branch 'develop' into FX-alan-message-access-slow 2016-03-11 09:41:53 +08:00
alan 55983093fd 优化课程反馈页面 2016-03-11 09:40:10 +08:00
cxt a7b9d8424a 只有全部列表中的学生可编辑分班 2016-03-10 17:41:53 +08:00
huang 440cd04414 Merge branch 'develop' into hjq_new_course 2016-03-10 17:14:19 +08:00
cxt 0d8052da28 老师把学生加入某一个分班 2016-03-10 17:04:26 +08:00
cxt fa3fd56686 题库发送课程的弹框搜索不能用 2016-03-10 15:48:39 +08:00
huang 281d31980d Merge branch 'develop' into hjq_new_course 2016-03-10 15:02:34 +08:00
huang c947121e2b 消息不显示问题（未完） 2016-03-10 14:52:49 +08:00
cxt 9fd0951ec3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-03-10 14:52:23 +08:00
ouyangxuhua 6cf518e2e4 1.组织的非成员用户，隐藏上传资源/导入资源；2.申请的子域名，一律改成小写 2016-03-10 14:38:33 +08:00
ouyangxuhua f917e96a12 组织栏目中的链接的url更新 2016-03-10 12:47:10 +08:00
cxt cc441826ee 测试代码即提交代码 系统得分为当次的测试得分 2016-03-10 11:15:37 +08:00
cxt 5b4ff5ec8a 学生列表中的作业积分为负分 2016-03-10 09:22:49 +08:00
ouyangxuhua a51ca428be 组织中，增加调整栏目显示顺序的功能 2016-03-09 18:06:28 +08:00
huang 2a1eac02a9 Merge branch 'hjq_new_course' into szzh 2016-03-09 15:28:28 +08:00
huang 84d7049add fork弹出新页面，解决间接性500问题 2016-03-09 13:17:37 +08:00
huang 99be187d54 版本库 无法预览的文件提供直接下载功能 2016-03-09 11:30:28 +08:00
cxt d3489ec5cb 作业回复时间、作品提交时间、作品评阅时间加到动态的最后更新时间 2016-03-09 11:15:43 +08:00
huang f469e51202 课程模块/通知、作业、留言、发帖，删除的时候统计数字递减 2016-03-08 17:38:38 +08:00
huang f022950408 Merge branch 'develop' into hjq_new_course 2016-03-08 16:17:18 +08:00
linchun 3e70db4e82 Merge branch 'develop' into linchun 
Conflicts:
	db/schema.rb
 2016-03-08 11:29:58 +08:00
huang 2fdddc6488 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2016-03-08 11:27:22 +08:00
huang ec4a3b321c 更新历史版本，下载次数，引用次数不清零 2016-03-08 11:26:55 +08:00
linchun 3c66a29767 完善课程资源列表，完成项目资源列表 2016-03-08 11:01:08 +08:00
cxt 3424be695e 题库：发送的弹框中，不要出现已经删除的课程 2016-03-08 09:12:37 +08:00
guange 3c513085d2 request变量 2016-03-07 21:43:18 +08:00
linchun b7f4b584f2 完成管理员界面课程资源列表 2016-03-07 16:46:02 +08:00
ouyangxuhua 2ea553e988 Merge branch 'ouyangxuhua' into develop 2016-03-07 16:15:13 +08:00
ouyangxuhua 0df34dd3ee 组织资源栏目，过滤条件“其他”内容 2016-03-07 16:14:44 +08:00
ouyangxuhua a0363b5511 组织资源发送后，发送次数动态增加 2016-03-07 12:57:24 +08:00
ouyangxuhua 319f286a65 解决一下问题：1.组织的资源的引用计数不会增加；2.组织资源栏目中，文件的宽度不合适 2016-03-07 12:19:48 +08:00
cxt cff5e9171f 导入作业后页面不应跳转到被导入的作业页面 2016-03-07 11:21:58 +08:00
ouyangxuhua 984cd76b7f Merge branch 'develop' into ouyangxuhua 2016-03-07 10:30:09 +08:00
ouyangxuhua b77b63bbf1 解决私有组织栏目通过url能访问的问题 2016-03-07 10:29:37 +08:00
huang 6ceb4f4549 Merge branch 'develop' into hjq_new_course 
Conflicts:
	app/models/course_contributor_score.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_homework_search_input.html.erb
	app/views/users/_show_user_homeworks.html.erb
	app/views/users/_user_homework_detail.html.erb
	app/views/users/_user_homework_form.html.erb
	app/views/users/user_homework_type.js.erb
	app/views/users/user_homeworks.html.erb
	app/views/users/user_homeworks.js.erb
 2016-03-05 03:17:47 +08:00
huang f381784a3c 数据迁移 2016-03-05 03:13:58 +08:00
huang 814e766577 课程过滤 2016-03-04 21:22:47 +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 ae40a4ea61 公共资源相关功能 2016-03-04 18:22:22 +08:00
huang bbbf13084e 修改搜索功能，页面跳转 2016-03-04 16:05:58 +08:00
cxt ffac8164f1 管理员的课程和项目列表，按照时间倒排 2016-03-04 15:55:45 +08:00
linchun bb8a6af13e admin界面添加精品课程页面，目前该页面中的精品课程是固定的 2016-03-04 15:31:40 +08:00
huang dfddb30ca3 附件引用 2016-03-04 14:21:39 +08:00
cxt 6ca702eb2c 题库发送的课程列表中不包含当前作业所在的课程 2016-03-04 13:18:43 +08:00
cxt 8aff404f0c 题库过滤作业的搜索 2016-03-04 11:37:14 +08:00
huang 50011985a9 课程资源库添加资源描述 2016-03-04 11:19:07 +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 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 5ab9e3b5b7 资源搜索 
作业留言
 2016-03-04 09:29:20 +08:00
huang e9c9112b38 公共资源封装 2016-03-04 00:41:41 +08:00
guange 79004e1328 修改绑定流程 2016-03-03 23:27:05 +08:00
huang 8815e99db5 资源上传跳转问题 2016-03-03 17:25:52 +08:00
huang 5fd36c0e78 课程、项目、组织资源导入 2016-03-03 17:15:47 +08:00
cxt f0d7542ac6 个人题库和公共题库 2016-03-03 17:04:38 +08:00
huang 3368680e49 课程、项目、组织添加导入资源功能 2016-03-03 10:38:37 +08:00
huang 21244a5657 资源库导入功能 2016-03-02 17:46:10 +08:00
huang b3fea3e229 资源库代码封装 2016-03-02 11:30:19 +08:00
guange 697906509b 修改菜单 2016-03-01 17:58:54 +08:00
guange f53d9e19f7 修改菜单 2016-03-01 17:55:03 +08:00
guange 8e1624fafe 修改菜单 2016-03-01 17:33:48 +08:00
huang 8edaa9d2bd 资源库 2016-03-01 17:33:44 +08:00
guange 1b171e414c 修改菜单 2016-03-01 17:31:44 +08:00
guange b823413267 修改菜单 2016-03-01 17:16:48 +08:00
guange c33b35383d 修改菜单 2016-03-01 17:13:06 +08:00
guange d5e8945619 修改菜单 2016-03-01 17:06:40 +08:00
guange 509d4a3df7 绑定提交改为ajax 2016-03-01 16:56:37 +08:00
guange a59f65a455 wechat 2016-03-01 16:13:37 +08:00
guange e487b39d16 修改wechat配置 2016-03-01 15:46:05 +08:00
guange e32fdf6bcb 修改wechat配置 2016-03-01 15:21:20 +08:00
guange dce93c8313 修改wechat配置 2016-03-01 14:50:05 +08:00
guange 60b35a46ce 获取企业id 2016-03-01 14:05:18 +08:00
guange 35f9dc6e77 传request参数 2016-02-28 22:28:44 +08:00
guange 0ab579af98 订阅时发绑定信息 2016-02-28 22:22:10 +08:00
guange 15d5fe127e merge 2016-02-28 21:30:40 +08:00
guange a83cb2a1fa merge 2016-02-28 21:28:54 +08:00
huang 81f54e44b4 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-02-26 19:25:36 +08:00
huang a10e973c75 版本库配置默认分支 2016-02-26 19:25:12 +08:00
ouyangxuhua 6e85b38b09 1.博客设为首页后转到个人主页；2.组织栏目设为首页正确实现文章 2016-02-26 17:11:18 +08:00
cxt 601c5906d4 Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 17:00:29 +08:00
cxt 5b4cec2c05 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 16:26:51 +08:00
cxt e3e2c37f12 超级管理员的最近登录用户列表添加老师列表 2016-02-26 16:26:20 +08:00
ouyangxuhua 956ce8045d Merge branch 'ouyangxuhua' into develop 2016-02-26 16:18:17 +08:00
newuser 555a9131c4 Gitlab端获取默认分支 2016-02-26 15:37:59 +08:00
newuser d2bd4706d3 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-02-26 14:57:41 +08:00
newuser d747ec854d Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
 2016-02-26 14:55:28 +08:00
cxt 09c8e57f1c 复制课程时可复制资源和作业 2016-02-26 10:41:14 +08:00
ouyangxuhua 991613d760 在转发表forwards记录发送帖子、通知 2016-02-25 16:22:42 +08:00
cxt c93b4d109a 作业动态添加子菜单：公开作品/取消公开 2016-02-25 16:18:24 +08:00
huang a6abdbacb9 Merge branch 'hjq_course' into hjq_new_course 2016-02-25 11:19:20 +08:00
huang 635e6300a1 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 
Conflicts:
	app/helpers/users_helper.rb
	app/views/users/_project_issue_detail.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
	db/schema.rb
 2016-02-25 11:17:54 +08:00
huang aef2dd8d1a 版本库通过修订好，导出对应的文件，导出对应内容 
高亮显示内容
内容修订对比 功能
 2016-02-25 11:06:10 +08:00
cxt c6e7e2e83b 模拟答题页面增加返回按钮，页面的layout改成课程相关 2016-02-25 10:23:38 +08:00
cxt 95170b0b2b Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-25 09:35:45 +08:00
guange 231df07c29 移除pry 2016-02-25 09:26:43 +08:00
ouyangxuhua a451680cf8 发送文件时，记录放在表forwards中 2016-02-24 17:09:43 +08:00
cxt e6ed988c10 Merge branch 'szzh' into develop 
Conflicts:
	db/schema.rb
 2016-02-24 17:00:08 +08:00
guange 296d6efbf1 单文件作业不压缩 2016-02-24 16:52:36 +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
huang 40fb140b6d 版本库提交记录diff信息 2016-02-23 15:09:15 +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
cxt b6bf78a5df 当天发布的资源显示未发布、日期选择器用中文 2016-02-23 11:35:07 +08:00
cxt a2e60944be 已发布资源的延期发布 2016-02-23 11:04:19 +08:00
cxt 98946b9855 课程上传资源弹框的延迟发布功能 2016-02-22 18:10:20 +08:00
cxt ba66425bef 学生打开分组作业列表报500 2016-02-20 18:26:52 +08:00
ouyangxuhua 1216f49ac2 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/org_document_comments/edit.html.erb
 2016-02-20 16:59:58 +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 212b37ef84 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2016-02-20 16:19:53 +08:00
huang a7470e059d 历史版本提供附件下载功能 2016-02-20 16:19:35 +08:00
ouyangxuhua fa08935f68 Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/views/projects/settings/_new_repositories.html.erb
 2016-02-20 11:13:38 +08:00
huang 534d93de77 弹框位置调整 2016-02-20 10:59:49 +08:00
cxt 096320d04c 发布问卷时默认选中“允许学生查看调查结果” 2016-02-20 10:50:46 +08:00
guange b2551f904b 组织没有显示的问题 2016-02-04 12:51:23 +08:00
cxt 368e4cd14a Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2016-02-02 15:51:49 +08:00
cxt 8b9bcb4719 导入题库的搜索不起作用 2016-02-01 10:04:07 +08:00
guange 71778ba948 拷贝课程图标 2016-01-29 22:10:04 +08:00
guange 724ff31751 Merge remote-tracking branch 'origin/szzh' into szzh 2016-01-29 21:16:27 +08:00
guange eb9232a087 at controller 的json应该登录 2016-01-29 21:15:23 +08:00
cxt ee73191a19 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-01-29 19:44:04 +08:00
cxt 1b5cdbe628 推荐的私有课程，点击“资源”返回403，点击“作业”也应该返回403 2016-01-29 19:41:47 +08:00
ouyangxuhua b7f1177938 1.解决组织动态中删除发送过来的帖子报404的问题；2.组织消息的状态能更新 2016-01-29 18:11:16 +08:00
Tim fa70e8a714 代码错误 2016-01-29 16:51:46 +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
cxt e9a7f6f826 导出学生作业成绩列表 2016-01-29 11:02:57 +08:00
cxt c942c843b9 导入作业增加引用次数 2016-01-28 16:27:46 +08:00
cxt 8cc87c007f 导入作业添加作业类型 2016-01-28 09:51:05 +08:00
cxt ec41cd4318 导入共享题库中的作业 2016-01-27 17:26:57 +08:00
ouyangxuhua 135cb410bc 1.解决资源过滤中资源总数与资源统计数不一致的问题；2.对栏目的子目录名进行限制，不能是members setting org_document_comments，因为这会引起路由冲突 2016-01-27 15:29:15 +08:00
guange d8ef2f0965 个人留言中的at启用 2016-01-26 18:24:15 +08:00
cxt 19003f27fc 课程添加is_copy属性 2016-01-26 15:05:45 +08:00
cxt 520811fdc7 留言按回复的更新时间排序 2016-01-26 11:17:55 +08:00
ouyangxuhua fbff28d70e Merge branch 'develop' into dev_hjq 2016-01-26 11:05:25 +08:00
ouyangxuhua dda64245b3 解决以下问题：1.编辑个人首页后，返回至个人动态；2.个人名片中，正确显示个人信息；3.同意申请子域名后，显示已同意申请。 2016-01-26 10:35:54 +08:00
cxt 945d0a933f 项目资源统计为负数 2016-01-25 17:34:04 +08:00
cxt 184e0ee689 管理员界面增加项目、组织、课程、用户、作业个数的显示 2016-01-25 16:50:34 +08:00
cxt b6e13340e5 个人留言的删除功能 2016-01-25 15:33:50 +08:00
ouyangxuhua 1607508887 增加将帖子发送至课程、项目的功能 2016-01-25 14:19:39 +08:00
Tim a2afec77e3 Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course 
Conflicts:
	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-01-25 11:32:55 +08:00
cxt 4465e93dae 最近登录报500 2016-01-25 10:16:33 +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