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

9693 Commits

Author SHA1 Message Date
ouyangxuhua e98338bf22 栏目增加资源类型，可以添加文件、删除文件、显示文件等 2015-12-11 16:30:50 +08:00
cxt d4bde8e73c 调整学生作品列表的样式 2015-12-11 16:05:18 +08:00
lizanle b178fb7f0a 消息提醒 病句 2015-12-11 15:56:37 +08:00
huang b981f3dcea 修复项目删除403问题 
课程回复的时候不显示删除按钮
 2015-12-11 15:39:38 +08:00
lizanle abc0598ed2 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-11 15:37:14 +08:00
lizanle 03318aac97 登录名不可修改要变成灰色 2015-12-11 15:36:59 +08:00
cxt c6470bc69b 提交作品选择分组成员时若某一个学生已加入到其他分组则不可选择 2015-12-11 15:31:15 +08:00
cxt bb2f49439e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2015-12-11 15:00:35 +08:00
cxt 27ed6df9d6 Merge branch 'szzh' into develop 2015-12-11 14:59:52 +08:00
cxt a3715051b1 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 14:59:13 +08:00
cxt f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
lizanle ec79ed04ee Merge branch 'szzh' into dev_zanle 2015-12-11 14:47:32 +08:00
lizanle b6607f7418 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-11 14:46:48 +08:00
huang f2b8335912 移出成员时，删除项目后没有关联删除而引起的400问题 2015-12-11 13:48:52 +08:00
huang fed989753a 修复林处账号不能查看消息的问题 2015-12-11 13:46:23 +08:00
huang 75fecc0402 项目删除功能 
项目删除权限
课程列表用户颜色
 2015-12-11 12:53:01 +08:00
huang 9c472b9358 课程成员列表乱的问题 2015-12-11 11:23:02 +08:00
huang 35c918cb40 Merge branch 'hjq_new_course' into develop 2015-12-11 11:02:09 +08:00
huang fbd1b2f541 用户留言重复提交问题 2015-12-11 10:53:14 +08:00
huang 01b21ceda1 项目留言重复提交问题 2015-12-11 09:52:17 +08:00
huang 1ba0dae3c4 修复课程留言重复提交问题 2015-12-11 09:42:19 +08:00
cxt ba5d72b315 管理员查看在线测验的权限 2015-12-11 09:18:12 +08:00
huang 670df76c70 注释掉项目邀请加入功能 2015-12-10 20:24:42 +08:00
huang 9710731a2c 课程配置添加登录名 2015-12-10 20:03:59 +08:00
huang c7b2c9e3af 课程删除功能 
admin中课程列表取消删除按钮
 2015-12-10 18:59:54 +08:00
huang a9510f4869 Merge branch 'dev_hjq' into develop 2015-12-10 17:29:52 +08:00
huang 4f7f4acb1f 课程删除 2015-12-10 17:26:03 +08:00
ouyangxuhua aab9594ac9 1.解决英文版下，组织成员列表编辑成员显示错误； 
2.解决在组织文章详情页面，删除文章报错的问题
 2015-12-10 17:22:59 +08:00
houxiang 87be2dd7fe modify the repositories_controller.rb conflict 2015-12-10 16:41:18 +08:00
huang fbba933a46 Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2015-12-10 16:09:42 +08:00
huang be940ee3aa Merge branch 'develop' into hjq_new_course 2015-12-10 16:09:36 +08:00
houxiang e9cfe007bb modify by hx 2015-12-10 15:59:31 +08:00
huang dbadbf8621 修改密码gitlab同步 2015-12-10 15:54:44 +08:00
ouyangxuhua 0a85fbf613 1.配置栏目列表，增加类型一列； 
2.暂时隐藏类型为“资源”的栏目的链接
 2015-12-10 15:53:05 +08:00
huang 74fe2607f3 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2015-12-10 10:58:34 +08:00
ouyangxuhua 1e652faec7 Merge branch 'develop' into dev_hjq 2015-12-10 10:55:59 +08:00
huang 4e0b442309 修改邮箱的时候同步到gitlab 2015-12-10 10:50:15 +08:00
lizanle 7f866a0b3a 课程被删除后不能被搜索 2015-12-10 10:00:14 +08:00
ouyangxuhua 2f7260cba2 1.在栏目表中增加field_type(类型)字段； 
2.在组织配置-》栏目，增加栏目类型。
 2015-12-09 17:24:59 +08:00
huang db582fd639 修改不同分支之间的显示最新提交状态 2015-12-09 17:08:03 +08:00
huang f2c1595d0d 1、同步没成功检测程序 
2、注册验证修改
 2015-12-09 16:57:12 +08:00
cxt 4e04df7a8a 分组作业的动态显示及关联项目 2015-12-09 16:33:48 +08:00
ouyangxuhua 78fb8b6254 1.编辑或者删除栏目的帖子返回对应页面 2015-12-09 16:19:52 +08:00
lizanle 2fbad38522 优化排序参数 
用于排序的字段最好不要分词
不然就是多值字段的排序会浪费大量的内存
 2015-12-09 12:57:25 +08:00
cxt f2f81d5243 作品列表的代码缩进 2015-12-09 10:52:56 +08:00
ouyangxuhua 333c0e41a0 1.栏目增加新建帖子功能； 
2.点击某栏目，显示相应的动态；
3.编辑栏目里的文章后，返回相应的栏目动态。
 2015-12-09 10:48:15 +08:00
cxt 53f9141cf1 分组作业动态 2015-12-09 10:29:54 +08:00
lizanle 6c02115f3f 不允许修改登录名 2015-12-09 10:17:30 +08:00
guange 3476731b83 将at js data整合到文件中 2015-12-09 09:59:13 +08:00
lizanle c1d82d6348 输入框 和 ke对齐 2015-12-09 09:39:07 +08:00
ouyangxuhua 09f0d0201e 组织增加栏目发帖功能 2015-12-09 09:23:22 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
cxt c26778b41c 分组作业关联项目 2015-12-08 17:36:35 +08:00
huang ac9f13c842 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 
Conflicts:
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 17:13:50 +08:00
huang 916d99be82 课程删除功能 2015-12-08 16:45:26 +08:00
houxiang 56cb83ffba 版本库首页没有统计commit_count，具体的详情页在开始统计 2015-12-08 15:56:31 +08:00
lizanle 92bc3361fe 匿评失败消息改变 2015-12-08 15:33:17 +08:00
ouyangxuhua 1881e18742 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-08 15:31:17 +08:00
ouyangxuhua bb7bcf46a9 1.设置首页后，跳转至组织首页 2015-12-08 15:30:58 +08:00
huang 42f5b86d95 添加字段删除课程 2015-12-08 10:32:10 +08:00
huang 7c34122ff6 fork的时候如果用户没有同步，则自动同步 2015-12-08 09:46:29 +08:00
huang 068c305c06 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course 
Conflicts:
	app/views/courses/member.html.erb
	app/views/courses/settings.html.erb
	app/views/repositories/show.html.erb
	db/schema.rb

处理冲突
 2015-12-08 09:10:21 +08:00
lizanle 5fcbde2ff1 资源库监听回车键 2015-12-07 17:29:14 +08:00
ouyangxuhua 8b14e7c549 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 17:19:52 +08:00
ouyangxuhua 5198f4dde4 Merge branch 'dev_hjq' into develop 2015-12-07 17:19:26 +08:00
ouyangxuhua 9d6b4783df 删除组织配置栏目的组织首页项 2015-12-07 17:18:46 +08:00
ouyangxuhua a8b7d1b81f 回复项目里的message,不增加项目动态及组织动态 2015-12-07 17:11:30 +08:00
huang 91fa3f6fab 解决项目样式冲突问题 2015-12-07 16:52:23 +08:00
lizanle ee661bb6d4 input光光标到最后的折中解决方案 2015-12-07 16:21:00 +08:00
ouyangxuhua e45ce0fb95 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-07 15:52:32 +08:00
lizanle 9e01f02a66 作业题目统一改为作业标题 
作业匿评截止消息改造
 2015-12-07 15:52:22 +08:00
ouyangxuhua 76db95aa03 1.组织页面中，退出后刷新组织页面； 
2.组织页面中，点击“个人主页”，打开新的页面；
3.组织页面页首部分，用户名不链接用户页面。
 2015-12-07 15:52:13 +08:00
lizanle ad2d9fa374 添加对帖子的全文搜索 2015-12-07 15:32:57 +08:00
cxt cb7ad682cf Merge branch 'develop' into cxt_course 2015-12-07 15:21:43 +08:00
cxt c8f4149206 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 15:18:43 +08:00
cxt 8e999ed9f0 作业动态的回复删除功能只在鼠标进入时显示 2015-12-07 15:18:32 +08:00
huang 5eb249515c 版本库显示样式 2015-12-07 15:12:30 +08:00
guange 57d05d147e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-12-07 15:06:15 +08:00
guange 71a5504017 去除at功能,合并 2015-12-07 15:05:51 +08:00
huang 9ff41c214b Merge branch 'develop' into dev_hjq 2015-12-07 14:40:25 +08:00
ouyangxuhua 9f30c7a44e 如果用户没有登陆，不能在组织页面中，增加项目或课程。 2015-12-07 14:37:35 +08:00
ouyangxuhua 7057a4cfea 组织页首增加退出功能 2015-12-07 14:31:08 +08:00
lizanle ef2ef7111c 添加对帖子的全文搜索 2015-12-07 14:31:05 +08:00
guange 1a2aff99be 调整显示的格式 2015-12-07 14:18:01 +08:00
guange 0c7db76371 tag没闭合的错误 2015-12-07 13:54:52 +08:00
ouyangxuhua c229104d78 修改编辑组织标题 2015-12-07 13:03:21 +08:00
ouyangxuhua 5034ddb4b6 修复组织的bug 2015-12-07 12:53:51 +08:00
cxt 79ce5c9ac5 匿评已结束时作业动态的作品按钮显示成“查看作品” 2015-12-07 11:31:37 +08:00
cxt 73e9a00a1a 作业动态添加回复的删除功能 2015-12-07 11:25:41 +08:00
cxt 0472a5ed0c Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-07 10:54:28 +08:00
cxt a62ecc10ad 作业动态设置评分后无法刷新 2015-12-07 10:54:18 +08:00
huang ab1c945a30 修改版本库库权限 
自己不能fork自己的项目
 2015-12-07 10:34:10 +08:00
Tim 75d79c6c47 问题跟踪样式调整 2015-12-07 10:14:39 +08:00
huang f67386e8a0 组织模块丢失代码还原 2015-12-07 10:06:51 +08:00
cxt b61a0a98e5 Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/student_work/new.html.erb
	app/views/users/_user_homework_form.html.erb
	db/schema.rb
	public/stylesheets/courses.css
 2015-12-07 09:47:18 +08:00
guange 3d2ac4b59f KE引用统一使用import_ke 2015-12-06 15:03:36 +08:00
guange af31946586 issue列表开启AT功能 2015-12-06 15:03:12 +08:00
huang bd3d0547f5 组织样式修改 2015-12-05 14:34:16 +08:00
ouyangxuhua 4c9d9dee35 组织首页样式 2015-12-05 13:27:58 +08:00
ouyangxuhua 108865968b Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-05 12:01:49 +08:00
ouyangxuhua 12c57e7e4b 将Jquery引入组织首页 2015-12-05 12:01:04 +08:00
huang 9d68fd7d28 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-12-05 11:39:50 +08:00
huang 9d7bc17115 Merge branch 'develop' into dev_hjq 2015-12-05 11:39:40 +08:00
ouyangxuhua 37a7abea53 组织首页 2015-12-05 11:31:20 +08:00
ouyangxuhua 01b82e59d8 实现组织首页功能 2015-12-05 11:30:05 +08:00
ouyangxuhua 5b0bdb5069 修改组织栏目的内容及样式 2015-12-04 18:19:35 +08:00
huang c7058e6bbf Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 17:45:18 +08:00
huang 4cb58211ad 邮件消息提示语修改 2015-12-04 17:44:46 +08:00
ouyangxuhua ab4d0e4678 组织界面增加分栏 2015-12-04 17:34:48 +08:00
huang 6fad26cabf 去死奥placebold 2015-12-04 17:32:56 +08:00
cxt 8b160b1c38 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 17:29:55 +08:00
cxt 19c34de643 编辑作品时弹出的作品确认框不提供重试的按钮 2015-12-04 17:29:39 +08:00
huang 120a7274d3 fork样式显示 2015-12-04 17:22:22 +08:00
huang c72cf55564 Merge branch 'develop' into szzh 2015-12-04 16:43:48 +08:00
huang 61d76e6744 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-12-04 16:42:55 +08:00
lizanle 4c00312f45 Merge branch 'szzh' into dev_zanle 2015-12-04 16:42:02 +08:00
huang 9716e99533 课程成员提交“修改角色” 2015-12-04 16:33:56 +08:00
huang 7daaa59010 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-12-04 16:22:02 +08:00
huang b6edabed9c 修改角色 2015-12-04 16:21:48 +08:00
cxt 8fe53468e1 作品追加附件 2015-12-04 16:21:11 +08:00
Tim dfa9b4cf74 学生列表调整 2015-12-04 16:13:55 +08:00
huang 4a41039fa6 课程英雄榜改成课程活跃度 2015-12-04 15:58:56 +08:00
huang 4d0956dff1 Merge branch 'develop' into gitlab_guange 2015-12-04 15:54:56 +08:00
huang 9f73807e05 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	db/schema.rb
处理冲突
 2015-12-04 15:54:18 +08:00
huang c1747ab217 fork重名，提交 2015-12-04 15:49:05 +08:00
lizanle dbfc4969e0 测验消息bug 2015-12-04 15:36:19 +08:00
lizanle e3c594a7ca Merge branch 'develop' into dev_zanle 2015-12-04 10:59:14 +08:00
ouyangxuhua 2855c0e409 修改项目动态，使其与课程动态及个人动态的样式一致，包括有回复框、过滤菜单、宽度、间距等 2015-12-04 10:59:09 +08:00
lizanle 6553559929 发送消息 2015-12-04 10:56:16 +08:00
huang 8f024bdf4d Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	db/schema.rb
 2015-12-04 09:12:24 +08:00
huang 7fe3a02d81 Merge branch 'gitlab_guange' into develop 2015-12-04 09:11:22 +08:00
huang 89b8f7783d 添加forked_form的id 2015-12-04 08:57:29 +08:00
huang 5d18b14e73 Merge branch 'hjq_new_course' of http://repository.trustie.net/xianbo/trustie2 into hjq_new_course 2015-12-04 00:16:21 +08:00
huang 057d9a3337 0 2015-12-04 00:15:47 +08:00
huang 8d891a9faa fork权限 2015-12-03 20:57:09 +08:00
huang b91c65798d 课程成员添加设置 2015-12-03 20:44:29 +08:00
cxt 4e9e7543ba chrome浏览器点击保存测验头部信息无反应 2015-12-03 19:21:35 +08:00
cxt 838140ada8 在线测验的自动发布和截止 2015-12-03 19:08:15 +08:00
cxt fd51b02e16 添加修订附件 2015-12-03 18:33:08 +08:00
cxt 77e96af78f 还原分组作业 2015-12-03 10:41:27 +08:00
cxt 9c4c90e066 Merge branch 'develop' into cxt_course 2015-12-03 09:55:18 +08:00
cxt f90ff781ab 学生提交作品页面的合作成员弹窗 2015-12-03 09:17:36 +08:00
ouyangxuhua cf41b13f3a 增加组织表和组织课程表的关联删除 2015-12-02 17:38:41 +08:00
ouyangxuhua 9baeb850a3 在管理员界面中，添加组织的编辑和删除功能。 2015-12-02 17:34:21 +08:00
ouyangxuhua 95b071a8f7 修复组织模块的bug 2015-12-02 16:48:49 +08:00
lizanle adb246f9ad 注释标记 错误 
<!-- -->
 2015-12-02 15:30:07 +08:00
lizanle 9fe5cfbf76 资源发送课程发送项目自动搜索 2015-12-02 14:38:41 +08:00
lizanle 2f0895c2c2 发送资源成功给出提示 
发送资源默认为发送课程
 2015-12-02 13:40:53 +08:00
cxt ae218fa86c 发布作业时添加分组作业 2015-12-02 11:14:46 +08:00
lizanle 7af82aac98 base_forums要加ajax-indicator ajax-model 2015-12-02 09:28:01 +08:00
lizanle 46ad5f45c1 搜索结果下一页样式不对 2015-12-02 09:23:12 +08:00
lizanle 35b543cd22 论坛发帖 采用ajax提交。这样子网络不好的情况就不会丢失数据了。 2015-12-01 17:23:14 +08:00
lizanle d4823e7c8b 贴吧更新时间 2015-12-01 15:48:25 +08:00
lizanle 304cc078a7 去掉警示的感叹号 2015-12-01 15:30:47 +08:00
cxt 68a29d8131 学生提交作品后可点击重试重新上传作品 2015-12-01 15:18:14 +08:00
ouyangxuhua 0aba11f175 解决组织配置在360浏览器显示不兼容的问题 2015-12-01 11:28:33 +08:00
lizanle 1103a114a0 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-01 10:36:16 +08:00
lizanle b2bca65025 分片默认为5 2015-12-01 10:33:57 +08:00
guange 52a0da83c4 匿名用户留言问题. 2015-11-30 21:52:05 +08:00
huang 9d970036f6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-30 17:21:38 +08:00
ouyangxuhua 3750a49b65 修复组织编辑下拉框的bug 2015-11-30 16:10:29 +08:00
ouyangxuhua 6f9c89d67b 1.更改首页内容，不显示作者等信息，增加取消首页、编辑首页、删除首页等功能； 
2.增加editor_of_documents表，记录文章编辑的作者、时间等，并显示首页的最后编辑人；
3.在首页编辑文章后，应返回首页。
 2015-11-30 16:04:43 +08:00
huang aa19f5f8d5 Merge branch 'gitlab_guange' into develop 
Conflicts:
	app/views/layouts/base_courses.html.erb

处理冲突
 2015-11-30 15:43:05 +08:00
huang 582a7c47a4 修改英雄版为0显示的问题 2015-11-30 15:42:00 +08:00
lizanle 7eb5d2a8fa Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-30 14:59:59 +08:00
lizanle 8bd9c0c7af tip 2015-11-30 14:59:51 +08:00
huang 364c9a3a9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
合并
 2015-11-30 14:35:37 +08:00
lizanle 29a8d1b9f5 tip 2015-11-30 13:22:01 +08:00
lizanle 96b704e191 所有者的更新时间随着被拥有者的改变而改天 
譬如course 里边这么写：has_many :boards
boards里边这么写就ok:belongs_to :course,:touch=>true
 2015-11-30 12:55:19 +08:00
lizanle 62399b6d72 资源课程搜索结果添加 标签 2015-11-30 11:21:21 +08:00
lizanle d266237590 kaminari分页添加上一页下一页 2015-11-30 11:08:08 +08:00
lizanle 3c946c034a Merge branch 'szzh' into dev_zanle 
Conflicts:
	db/schema.rb
	kaminari分页添加上一页下一页
 2015-11-30 11:07:53 +08:00
lizanle 1c3bff0007 资源库的删除bug 
和右键菜单的bug
和变背景色的bug
 2015-11-30 10:39:50 +08:00
huang d67fc18988 英雄榜、贡献榜显示真实姓名 
为零的时候不显示
 2015-11-30 10:20:47 +08:00
lizanle 34ac56e0a0 attachment index_document 2015-11-27 19:07:10 +08:00
lizanle e728dd55eb Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/models/attachment.rb
	db/schema.rb
 2015-11-27 19:02:07 +08:00
lizanle 96290ad975 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/models/attachment.rb
	db/schema.rb
 2015-11-27 18:47:19 +08:00
lizanle 582cd6f5d4 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/models/attachment.rb
	db/schema.rb
 2015-11-27 18:47:02 +08:00
huang ae9f1c704a 500问题 2015-11-27 18:36:38 +08:00
huang cb51545a31 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-11-27 18:03:01 +08:00
huang aefab8abf3 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-11-27 18:01:28 +08:00
cxt b616612032 测验取消按钮的还原功能暂时隐藏 2015-11-27 17:57:17 +08:00
ouyangxuhua 00ac79bb34 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-27 17:28:20 +08:00
ouyangxuhua 879dee0cd6 关闭组织关联项目或课程弹窗，刷新整个页面。 2015-11-27 17:27:55 +08:00
huang a6d3ff2b14 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-27 17:18:31 +08:00
huang 41b99af7dd Merge branch 'develop' into sw_new_course 2015-11-27 17:17:21 +08:00
lizanle cb910b8d4a 系统消息添加logo 2015-11-27 17:02:37 +08:00
ouyangxuhua edea776b03 Merge branch 'szzh' into dev_hjq 2015-11-27 16:28:16 +08:00
ouyangxuhua 89d01679a7 组织中，重复的项目和组织不显示 2015-11-27 16:27:23 +08:00
huang ee7fb11acc Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-11-27 16:01:03 +08:00
huang e3e0f4ab37 鼠标移动+号显示留言 2015-11-27 16:00:43 +08:00
ouyangxuhua 3abc3f7af0 组织文章编辑，返回对应界面 2015-11-27 15:25:49 +08:00
Gan Yi.ang 79656aa205 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-11-27 15:22:18 +08:00
Gan Yi.ang c3a27151ca 修复_revision 2015-11-27 15:21:58 +08:00
cxt 85aade79ce Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 
Conflicts:
	public/stylesheets/courses.css
 2015-11-27 15:21:32 +08:00
cxt f7ac2b0ef5 老师查看学生的答卷结果 2015-11-27 15:19:13 +08:00
lizanle e710f443c2 全站搜索 2015-11-27 15:17:17 +08:00
huang 501a8f905b Merge branch 'develop' into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/courses.css
 2015-11-27 14:56:30 +08:00
huang 36b1649fbd Merge branch 'szzh' into gitlab_guange 
Conflicts:
	db/schema.rb
 2015-11-27 14:49:49 +08:00
huang 2ec78d07fa Merge branch 'szzh' into hjq_new_course 2015-11-27 14:47:16 +08:00
ouyangxuhua 25b66b5dbb 取消弹窗 2015-11-27 14:43:08 +08:00
huang 1cc6e305ed 完成新功能模块开发： 
1、如果没有成绩则不显示
2、工具框展开没有则不显示
 2015-11-27 13:52:40 +08:00
ouyangxuhua 365349878d 组织加入项目或者课程，刷新项目列表和课程列表；同时，弹窗给出关联成功的提示 2015-11-27 13:17:23 +08:00
ouyangxuhua e0f4050779 1.修改组织中关联项目和课程的内容和样式 2015-11-27 12:34:02 +08:00
Gan Yi.ang ee85cc35ed Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 2015-11-27 11:27:03 +08:00
Gan Yi.ang 1115d54d9a 非trustie用户changesets_latest_coimmit 2015-11-27 11:25:16 +08:00
ouyangxuhua 4aa827eb4a 组织页面中，点击项目收起项目列表，再点击展开列表；点击课程同样如此。 2015-11-27 11:02:48 +08:00
Tim 2d14b66336 作品列表样式调整 2015-11-27 10:56:46 +08:00
huang 042b197767 课程英雄榜界面调整 
动作触发的时候更新总分
更换迁移顺序
 2015-11-27 10:49:41 +08:00
ouyangxuhua b05708f6e8 解决一下三个bug: 
1.新建组织文章时，置标题和描述为空，点击取消按钮，却弹出“标题不能为空”的提示信息
2.课程/项目关联组织：点击取消按钮不应该直接收起关联组织列表
3.组织详情页面内再编辑组织，点击确定编辑的按钮后又返回组织列表页面，应返回组织详情页面
 2015-11-27 10:43:21 +08:00
lizanle 7cb39d1754 全站搜索 2015-11-27 10:40:58 +08:00
cxt 1f2675020b 学生答题未完成时可保存试卷 2015-11-27 10:15:25 +08:00
houxiang ee746b2d64 Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange 
need it
 2015-11-27 10:12:00 +08:00
houxiang c6b5abba4e hide the the count of project'repo 2015-11-27 10:10:59 +08:00
lizanle ee47187a61 全站搜索 2015-11-27 09:52:51 +08:00
ouyangxuhua 58365e8892 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/new_user.css
2.组织增加项目功能
 2015-11-27 09:50:17 +08:00
huang 8c83bbfff3 课程英雄榜数据 2015-11-27 00:48:08 +08:00
huang 061a1f602a 效果实现 2015-11-26 21:17:04 +08:00
huang aca7684414 课程英雄榜 
各模块动作 触发加分
 2015-11-26 18:22:03 +08:00
cxt cc0ff6bbc0 Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-11-26 17:22:46 +08:00
cxt dec5980443 截止时间一到立即提交试卷 2015-11-26 17:20:17 +08:00
cxt f8621cac76 未设置考试时长时，只要还未到截止时间就可以一直提交试卷。 2015-11-26 16:57:51 +08:00
lizanle dcd441a9db 全站搜索 2015-11-26 16:43:10 +08:00
ouyangxuhua 9c3aed8028 增加组织加入课程功能 2015-11-26 16:29:50 +08:00
cxt ed9cef486f 测验列表页面的按钮调整 2015-11-26 15:21:46 +08:00
cxt b690fa0b05 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-26 14:48:01 +08:00
cxt b602e1c85d 学生答题页面显示试卷截止时间 2015-11-26 14:47:52 +08:00
Tim 5bdcdc607f 测验列表格式更改 2015-11-26 14:45:35 +08:00
cxt f1bb1bb8c2 测验列表的创建时间改成截止时间，每个测验名字前增加序号，显示发布状态 2015-11-26 14:36:19 +08:00
cxt cbdc6bb889 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-26 11:22:52 +08:00
cxt 6b72b4bb17 非课程参与人员无法查看私有课程的测验列表 2015-11-26 11:22:42 +08:00
Tim 09e0e5e93d 单选多选还原 2015-11-26 11:10:17 +08:00
Tim 2a73751fd9 多选题样式调整 2015-11-26 10:56:24 +08:00
Tim 2b6cae5418 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/views/exercise/_show_MC.html.erb
 2015-11-26 10:29:21 +08:00
Tim a0c73a5a54 单选题样式调整 2015-11-26 10:27:32 +08:00
cxt 6513c0afee 测验题目的删除按钮增加title 2015-11-26 10:11:54 +08:00
cxt 6f4b6a6b67 填空题的候选答案不能为空，选择题和填空题至少得有一个选项或一个候选答案 2015-11-26 10:03:12 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
cxt 2cd1c07028 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-25 16:05:13 +08:00
cxt c7cf34500c 老师若未设置测验的发布时间则提交后立即发布 2015-11-25 16:05:02 +08:00
huang c8b1cae947 建立贡献榜表及相关关联 
部分页面
按总分排序（英雄榜）
部分页面（未完成）
 2015-11-25 15:16:33 +08:00
Tim bd7ee66e77 新建测验样式调整 2015-11-25 15:02:32 +08:00
cxt 7fb78e4816 新建测验标题等内容时 点击取消应还原编辑框中的内容 2015-11-25 10:38:43 +08:00
cxt 3e0609afe3 测验时长和题目分数增加数字验证 2015-11-25 10:24:46 +08:00
cxt 1ae514ca48 测验的发布日期和测验时长做成可选的 2015-11-25 09:38:13 +08:00
ouyangxuhua 2dc31637d8 项目和课程中加入组织时，如果已经加入了某组织，就不要重复加入。 2015-11-24 17:29:58 +08:00
huang 85515befc4 实现工具栏数字大于0显示，小于0隐藏 2015-11-24 17:29:57 +08:00
cxt 0e7cf4b122 学生作品页面的批次列表只显示已发布的作业 2015-11-24 16:21:25 +08:00
cxt e89cb99743 添加学生测验结果页面的批次链接 2015-11-24 16:20:29 +08:00
cxt ec00b86c15 学生多次新建作品时提醒学生不能重复提交 2015-11-24 15:17:47 +08:00
Tim 64d4789150 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/users/user_organizations.html.erb
 2015-11-24 15:06:19 +08:00
Tim 269d2f992e 组织列表搜索框调整后注释 2015-11-24 15:02:25 +08:00
ouyangxuhua a3146c66ae Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-24 12:51:12 +08:00
ouyangxuhua ccfbc1e0bd 1.组织翻页增加type参数； 
2.删除组织表中冗余的项目动态和课程动态。
 2015-11-24 12:50:43 +08:00
cxt b46561dac1 提交作业时若作品名称和作品描述为空，则不弹出作品校验弹框 2015-11-24 10:34:23 +08:00
houxiang ad891aea39 分支合并 2015-11-24 10:19:20 +08:00
houxiang 6b481c8961 mute the fork function by hx 2015-11-24 10:12:21 +08:00
huang 55ff5f4931 Merge branch 'develop' into gitlab_guange 
Conflicts:
	app/views/projects/settings/_join_org.html.erb
	db/schema.rb
处理冲突
 2015-11-24 09:55:26 +08:00
huang 3af96c96e7 finalize the commit_counts problems by hx 2015-11-23 21:07:43 +08:00
houxiang c3bbf3490f modify show 2015-11-23 19:50:12 +08:00
houxiang b3d36705d2 modify the commit_count by hx 2015-11-23 19:48:20 +08:00
ouyangxuhua 68bb142278 解决组织bug:动态过滤，点击“展开更多”，有通知等其他动态 2015-11-23 17:29:55 +08:00
huang 85a219f7e9 项目动态\清除 2015-11-23 17:16:05 +08:00
huang 39455f9f8a 作业重复提交问题 2015-11-23 17:08:17 +08:00
houxiang 56519389d2 add binarysearch for commit_count by hx 2015-11-23 16:51:12 +08:00
ouyangxuhua 71e98c873d 组织回复框中，默认图片颜色为灰色，当焦点放在输入框时，图片颜色变亮。 2015-11-23 16:40:21 +08:00
ouyangxuhua 1914639bc3 成功添加某成员后，在搜索框中输入的该成员关键字就要自动清空 2015-11-23 10:17:20 +08:00
ouyangxuhua 65548cd8c3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-23 09:32:21 +08:00
ouyangxuhua d2a87127da 我的组织搜索功能显示 2015-11-23 09:32:03 +08:00
huang 83c7e981af Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 21:50:35 +08:00
cxt dbe236032b 新建题目时必须先保存标题 2015-11-20 21:50:27 +08:00
huang 3083f683b9 修改删除的时候顺序乱的问题 
添加相应的参数
 2015-11-20 21:14:09 +08:00
huang 550d056630 删除某个题目后顺序排列 2015-11-20 20:55:37 +08:00
cxt 89f8f5f383 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 20:44:40 +08:00
cxt b10fbcde8c 取消发布和发布测验 2015-11-20 20:44:27 +08:00
huang dd148fb7c5 Merge branch 'szzh' into sw_new_course 
Conflicts:
	db/schema.rb
 2015-11-20 20:25:17 +08:00
cxt b9460efa08 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 20:23:21 +08:00
cxt cc19c345e1 提交 2015-11-20 20:23:02 +08:00
huang 2435f06f44 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 20:03:11 +08:00
huang 8b29002a0f 修改得分规则 2015-11-20 20:02:57 +08:00
cxt c36ec99ff6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 19:59:17 +08:00
cxt 9ca336a70a 发布和取消发布 2015-11-20 19:59:05 +08:00
huang c0dfc17b19 修改状态更新 2015-11-20 19:35:32 +08:00
huang da55b00da7 删除插入问题 2015-11-20 19:05:39 +08:00
huang a3122a9a2c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 18:39:44 +08:00
huang aa36c927d3 0 2015-11-20 18:39:35 +08:00
cxt c07e2fe2d2 发布试卷 2015-11-20 18:38:50 +08:00
cxt 98297da226 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 18:29:36 +08:00
cxt c9ba57f64b 去掉关闭、导入等功能 2015-11-20 18:29:26 +08:00
huang bb726e3475 提交答案验证 2015-11-20 18:21:31 +08:00
huang d1e0e0fd30 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 18:02:04 +08:00
huang 97485ca221 修改show逻辑 
提交问卷后学生页面显示
 2015-11-20 18:01:50 +08:00
cxt da34083a2a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 18:00:22 +08:00
cxt 332ace0f34 列表 2015-11-20 18:00:11 +08:00
ouyangxuhua 6068867670 项目动态和组织动态删除后，删除相应的组织动态 2015-11-20 17:42:43 +08:00
huang 431d1d886c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 17:29:33 +08:00
huang 8728557813 老师和学生统计数目区分 2015-11-20 17:29:15 +08:00
cxt d4d2adddb2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/controllers/exercise_controller.rb
 2015-11-20 17:26:49 +08:00
cxt eee63b2495 提交前验证数据不为空 2015-11-20 17:25:03 +08:00
huang ed86e3ee5a 三种类型题目计算总分 2015-11-20 17:18:57 +08:00
ouyangxuhua a57260aae6 修改当“Message”回复对应的组织动态 2015-11-20 16:41:15 +08:00
ouyangxuhua 5cfc8c2f8d 编辑文章后，或者回复文章后，更新组织动态的更新时间 2015-11-20 16:16:46 +08:00
huang 74f6cb2e64 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 15:14:07 +08:00
huang db46e5e4af 问卷得分统计 2015-11-20 15:13:53 +08:00
cxt b0730dfb81 测验 2015-11-20 15:12:07 +08:00
ouyangxuhua d77d4a421b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-20 14:51:16 +08:00
ouyangxuhua dcbdea9bb5 1.修复文章详细列表删除后，页面报错的问题； 
2.文章详情页面中，文章回复显示中回复人丢失问题修复
 2015-11-20 14:50:48 +08:00
cxt 9f6fc79df0 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 14:34:27 +08:00
cxt 863d7ed4b5 单选和填空 2015-11-20 14:34:09 +08:00
Tim 1aa7599771 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-20 14:31:10 +08:00
Tim e3d78bf4f0 组织样式更改 2015-11-20 14:30:54 +08:00
huang cb3f0d1c97 按类型分类，序号递增 2015-11-20 14:28:47 +08:00
huang 07ee819370 学生多选答题 2015-11-20 13:39:40 +08:00
huang 302dfaf933 新建万卷初始showresult 2015-11-20 13:04:51 +08:00
huang 469e71e77d Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 12:55:30 +08:00
huang 13af6e64b2 修改允许学生查看参数 2015-11-20 12:55:23 +08:00
cxt 99945d5bb5 学生答题界面的修改 2015-11-20 12:54:41 +08:00
ouyangxuhua e01a7c2627 Merge branch 'szzh' into dev_hjq 2015-11-20 11:14:11 +08:00
ouyangxuhua b10ff36c51 1.组织文章和成员访问权限控制； 
2.修改编辑文章不能提交的问题。
 2015-11-20 11:12:45 +08:00
huang e9998edbc2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 11:08:55 +08:00
cxt 4204521e14 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-20 11:09:02 +08:00
cxt acaac93da1 tijiao 2015-11-20 11:08:50 +08:00
huang 3deebf2006 show 2015-11-20 11:08:47 +08:00
ouyangxuhua faa99a5df4 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-11-20 10:52:43 +08:00
ouyangxuhua 40a44c3568 增加文章二级回复功能 2015-11-20 10:52:26 +08:00
huang 21694daa59 多选顺序按小到大排序 2015-11-20 10:05:34 +08:00
cxt d583ca1d70 样式调整 2015-11-20 09:54:46 +08:00
huang 08c7eb8d40 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 21:21:26 +08:00
huang 81e2827277 解决参数为空的bug 2015-11-19 21:21:02 +08:00
cxt 20f7560b07 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 21:19:30 +08:00
cxt 9aee23507c 学生答题页面、答题结果页面、老师的试卷页面 2015-11-19 21:19:18 +08:00
huang b71e6a9b9a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 20:38:24 +08:00
huang 20a80fe6eb 修改JS 2015-11-19 20:38:03 +08:00
huang 74343a4929 发布问卷、取消问卷 2015-11-19 20:35:08 +08:00
cxt 602373812f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 17:50:32 +08:00
cxt d91a6c03b1 编辑 2015-11-19 17:50:24 +08:00
huang 87e7a51278 删除 2015-11-19 17:36:58 +08:00
huang 7ab0f4764a 主管题插入删除更新 2015-11-19 17:31:26 +08:00
cxt 27c88fda4f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/views/exercise/_edit_single.html.erb
 2015-11-19 17:20:25 +08:00
cxt 2c1b03079b 学生测验界面 2015-11-19 17:18:58 +08:00
huang 02f6b636cd 完成更新功能 2015-11-19 17:09:59 +08:00
huang f3614999da gi 2015-11-19 16:38:46 +08:00
huang 841ebb7846 简单题更新，未完 2015-11-19 16:21:31 +08:00
lizanle 34a2c2c90d 课程创建属性添加 是否允许学生上传资源 2015-11-19 15:13:34 +08:00
lizanle dffabce806 Merge branch 'dev_zanle' into szzh 
Conflicts:
	db/schema.rb
 2015-11-19 15:03:56 +08:00
houxiang fdedcbfa81 增加了注释 2015-11-19 14:59:26 +08:00
Gan Yi.ang f6bfd7824d 优化查看commits那个页面 2015-11-19 14:42:37 +08:00
cxt cf4717278f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 14:36:45 +08:00
cxt 5e5c18725d 用户在新建题目时必须先保存其他正在编辑的题 2015-11-19 14:35:51 +08:00
huang a900c70e76 试题更新 2015-11-19 14:26:51 +08:00
huang d7020fad1f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 13:07:00 +08:00
cxt 3929aa6dde 编辑 2015-11-19 13:06:17 +08:00
huang 4c71d8a85e Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 11:39:04 +08:00
huang bc47382115 用户提交答卷后，给出得分 2015-11-19 11:38:44 +08:00
cxt 4cd9f6a502 新建题目时分数自动获取同一类型题目的最后一个分数 2015-11-19 11:37:49 +08:00
ouyangxuhua 0c891236a8 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/projects/settings/_join_org.html.erb
 2015-11-19 10:44:30 +08:00
ouyangxuhua 09659387e7 文章动态中，将组织改成组织文章 2015-11-19 10:15:33 +08:00
ouyangxuhua 478a534c96 1.将课程动态加入组织动态的过滤条件中； 
2.创建文章成功后，给出信息提醒
 2015-11-19 10:08:11 +08:00
Gan Yi.ang ea47a8085a 修复新建版本库无响应 2015-11-19 09:20:25 +08:00
cxt c7476b3f86 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-19 09:13:56 +08:00
cxt a173e924d0 插入题目 2015-11-19 09:13:46 +08:00
huang 037d998f23 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 21:16:43 +08:00
huang 2296a2f50c 添加学生提交作业 
老师发布作业功能
 2015-11-18 21:16:24 +08:00
cxt 398a7da533 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 20:14:30 +08:00
cxt 368fc339c0 样式调整 2015-11-18 20:14:19 +08:00
huang 8cf22767f9 新建问答题 2015-11-18 19:58:00 +08:00
huang 8e4b2bd7d4 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 18:28:37 +08:00
huang 1606e9ddab 0 2015-11-18 18:28:17 +08:00
cxt 28f7390595 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 17:56:41 +08:00
cxt 3d3d50f1ea 编辑 2015-11-18 17:56:01 +08:00
ouyangxuhua 8e359c3d94 隐藏我的组织的搜索功能 2015-11-18 17:27:29 +08:00
huang 1d5ae6d561 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 17:24:18 +08:00
huang ac95e1584c 问卷删除功能 2015-11-18 17:23:57 +08:00
ouyangxuhua af981f841e 添加组织时，翻页提醒功能改善 2015-11-18 16:52:03 +08:00
cxt d83e2e36ae Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 16:51:58 +08:00
cxt d407610740 填空题 2015-11-18 16:51:47 +08:00
houxiang 4a9da97f9b modify by hx add commit_count_detail_show 2015-11-18 16:23:02 +08:00
houxiang fe3fbacdbc modify commit count show 2015-11-18 16:11:51 +08:00
huang cd2d947cb2 多项选择标准答案 2015-11-18 16:06:34 +08:00
ouyangxuhua 219774afab 将课程动态加入组织动态中 2015-11-18 16:05:08 +08:00
cxt f850a71b59 测验 2015-11-18 15:30:39 +08:00
lizanle 193471adf1 学生自己上传的资源应允许自己删除 2015-11-18 15:09:16 +08:00
huang 935b1f9f9e 大写小写问题 2015-11-18 14:50:03 +08:00
huang de17ffa605 区分答案大小写 2015-11-18 14:31:35 +08:00
huang 3efae6bde2 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 14:06:38 +08:00
huang 8965775004 show方法修改 2015-11-18 14:06:21 +08:00
cxt 0405d4eee6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 14:05:47 +08:00
cxt 249b15751d 新建多选题 2015-11-18 14:05:29 +08:00
huang 7f5fa7fb6f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/helpers/exercise_helper.rb

解决冲突
 2015-11-18 14:03:17 +08:00
huang 25344ef0de show方法 2015-11-18 14:01:55 +08:00
huang deb0f151c4 单选数字转换 2015-11-18 13:55:42 +08:00
cxt c5c16e25b6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-18 11:14:34 +08:00
ouyangxuhua b231b44e81 1.项目和课程中，添加翻页提醒； 
2.项目和课程中，删除组织关联时，给出弹窗，确认是否删除。
 2015-11-18 11:12:40 +08:00
ouyangxuhua fc7e41ebf9 1.在项目和课程在关联和删除关联组织后，翻页能链接到正确的位置 2015-11-18 10:57:17 +08:00
lizanle 60fda5e391 火狐MathJax显示公式错误，还是不能不用图形字体 2015-11-18 10:55:55 +08:00
cxt 265fe08b2c 在线测验 2015-11-18 10:49:57 +08:00
huang 282c7f5bd2 修改添加题目相关 2015-11-18 10:46:56 +08:00
lizanle d133acbf2a 论坛帖子显示更新时间 2015-11-18 10:41:54 +08:00
lizanle 6a59e39ef1 允许学生上传资源 2015-11-18 10:18:54 +08:00
lizanle 8e55c98ccf MathJax不允许使用图片资源，不然图片太多了。有30000个左右 2015-11-18 09:57:03 +08:00
huang 02db1b7e14 问卷添加标准答案 2015-11-17 21:13:17 +08:00
huang 9cf5a92a44 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-17 20:24:44 +08:00
huang 221a73309f index页面删掉无效的测试 2015-11-17 20:23:39 +08:00
cxt 452cf1c854 测验 2015-11-17 20:23:14 +08:00
cxt 2c9c87c3c6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/controllers/exercise_controller.rb
 2015-11-17 19:52:41 +08:00
cxt bb99a11c37 页面修改 2015-11-17 19:49:33 +08:00
huang d61ec92318 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-17 19:48:08 +08:00
huang f316f43d6d 修改edit界面无法找到的问题 2015-11-17 19:47:48 +08:00
cxt 7472d959f3 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-17 19:33:27 +08:00
cxt 631418a012 单选题 2015-11-17 19:33:14 +08:00
huang 3cdda2a60a 修改创建方式 2015-11-17 19:29:25 +08:00
huang 9935cfea44 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-17 18:34:15 +08:00
huang 99f4483a16 删除问卷（未完） 2015-11-17 18:34:01 +08:00
cxt f68ffc99ec 保存单选题 2015-11-17 18:26:39 +08:00
cxt b3e6bf40ff Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-17 18:23:07 +08:00
cxt cc08e5e32e 保存测验信息 2015-11-17 18:22:31 +08:00
huang 4a0865ab76 添加和编辑题目 2015-11-17 18:20:47 +08:00
ouyangxuhua 71bf80c7a5 1.创建组织课程关联表，建立相应模型及控制器； 
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
 2015-11-17 17:34:50 +08:00
lizanle 291868ba43 Merge branch 'szzh' into dev_zanle 
Conflicts:
	db/schema.rb
 2015-11-17 16:48:03 +08:00
lizanle 0eff2bcb74 课程添加允许学生发布资源的配置 2015-11-17 16:43:50 +08:00
huang 0e94b4f33b 解决版本库不能新建问题 2015-11-17 16:18:32 +08:00
lizanle 94831443a5 MathJax的js 2015-11-17 15:24:06 +08:00
huang 651f6565be Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/controllers/exercise_controller.rb
处理冲突
 2015-11-17 15:22:31 +08:00
huang 23ca20692f 问卷部分方法 2015-11-17 15:20:59 +08:00
cxt 034a92bb7b 新建测验页面 2015-11-17 15:18:07 +08:00
huang 0316bf698f exercise新增、update 2015-11-17 11:25:17 +08:00
ouyangxuhua 8aeae831b8 项目配置中添加组织后，更新组织列表，而不是隐藏 2015-11-17 10:56:11 +08:00
lizanle 7ad2e657eb 提示信息去掉感叹号 2015-11-17 10:34:59 +08:00
lizanle 1961868e5e Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-17 10:20:05 +08:00
lizanle 6af8bfef37 加入课程的相关系统提示加上logo 2015-11-17 10:19:48 +08:00
ouyangxuhua 6f5cb8f142 增加组织动态的过滤功能，组织动态包括项目动态和组织的动态 2015-11-17 10:17:07 +08:00
ouyangxuhua fba461f94a 增加组织模块中项目讨论区的回复功能 2015-11-17 09:51:16 +08:00
cxt 167d001b3f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-17 09:34:09 +08:00
cxt 5400b907e6 学生测验列表 2015-11-17 09:33:40 +08:00
ouyangxuhua bd6a1a9d49 增加组织动态中的项目问题的回复框 2015-11-16 17:21:26 +08:00
ouyangxuhua 687c0c8306 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/org_document_comments/edit.html.erb
 2015-11-16 15:50:46 +08:00
ouyangxuhua d220dbbc9a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-11-16 15:45:18 +08:00
ouyangxuhua 10dedcb7be 增加组织成员加入时间 2015-11-16 15:39:59 +08:00
ouyangxuhua de32745eef 1.将项目动态数据迁移至组织动态； 
2.在组织动态中，按时间倒排显示组织动态；
3.增加我的组织中搜索功能。
 2015-11-16 15:02:57 +08:00
cxt 10ac8eaa35 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-16 10:58:08 +08:00
cxt c50bcf9331 对于提交已截止的作业，作业状态由“作品提交中”改为“作品补交中” 2015-11-16 10:56:00 +08:00
houxiang 9350841d50 change by hx 2015-11-16 10:44:36 +08:00
cxt e22b4cbdeb 作业提交截止后，未提交作品的学生看到的作业动态将显示“补交作品” 2015-11-16 10:44:27 +08:00
cxt 62d80c27d6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-11-16 08:59:54 +08:00
huang ca8b62b8bd Merge branch 'szzh' into gitlab_guange 2015-11-14 15:22:05 +08:00
huang 50dfe5ce8b 修正接口 项目owner为当前用户，同步gitlab端用户 2015-11-14 15:20:29 +08:00
ouyangxuhua f5460d1126 组织动态添加项目动态 2015-11-14 15:19:49 +08:00
ouyangxuhua c9a7a94767 组织动态添加项目动态 2015-11-14 15:15:54 +08:00
ouyangxuhua 1e1c210939 组织动态添加项目动态 2015-11-14 14:57:49 +08:00
ouyangxuhua b7f12b9cde Merge remote-tracking branch 'origin/szzh' into szzh 2015-11-14 14:32:02 +08:00