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

603 Commits

Author SHA1 Message Date
cxt 6c7925a7b4 样式调整 2016-07-22 18:20:11 +08:00
huang 8dbdebe02e 修改动态问题 2016-07-22 16:35:03 +08:00
huang ff8cad5cf2 项目动态中添加提交动态 2016-07-21 18:08:13 +08:00
huang 6357f5be2a 解决成员列表获取单位不准确的问题 2016-07-21 09:27:14 +08:00
cxt c9e0143fe8 作业动态的时间 2016-07-15 19:36:46 +08:00
cxt 48e5a0be7e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	db/schema.rb
 2016-07-15 17:38:56 +08:00
huang 4c5052dce2 作业按更新时间排序 2016-07-15 17:28:57 +08:00
cxt 5b070b6acc 消息列表的html标签 2016-07-15 16:52:18 +08:00
huang f9e03434c2 Merge branch 'develop' into rep_quality 2016-07-15 16:51:31 +08:00
huang 2af3c50dbc 里程碑区分issue状态“已解决”“已关闭” 对应不同样式 2016-07-15 16:43:07 +08:00
huang b2a8a0fed6 修复里程碑进度条数据显示错误的问题 2016-07-15 16:28:33 +08:00
cxt b77779ca55 文章的二级回复和组织帖子的二级回复 2016-07-14 17:23:48 +08:00
cxt ded8f48d34 博客的二级回复 2016-07-13 15:20:39 +08:00
cxt f0e456729e 过滤掉消息中的html 2016-07-12 16:21:30 +08:00
cxt 1a15c0f567 新建班级发布作业报500 2016-07-08 19:25:26 +08:00
cxt 3362ebe321 线下作业 2016-07-08 18:22:59 +08:00
cxt 5a22e9a147 作业启动匿评 2016-07-08 15:44:03 +08:00
cxt 13bae8f8a5 线下作业 2016-07-08 13:17:14 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course 
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
 2016-07-07 15:14:11 +08:00
cxt da7509f64c 课程大纲的优化 2016-07-07 15:04:57 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
cxt 599cedaa18 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2016-07-04 14:15:56 +08:00
cxt cc649ae64b 课程讨论区、项目讨论区、帖子详情页面的二级回复 2016-07-04 14:14:51 +08:00
huang 374a905d1e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-07-01 17:53:47 +08:00
cxt 0e2e1b09b5 title修改 2016-07-01 17:51:01 +08:00
txz 7178c50b1d branch's total commits 2016-07-01 15:37:39 +08:00
cxt bd3277681c 分组作业的作业成绩导出、学生列表的导出 2016-06-24 10:50:40 +08:00
cxt 126bf9c195 个人留言、课程留言的二级回复 2016-06-23 14:47:22 +08:00
huang bfa447c195 未登录状态下anonymos改为未登录 2016-06-06 15:11:07 +08:00
huang ca3b072f85 热门项目按照项目得分排序及设置界面中默认设置 2016-06-03 10:31:29 +08:00
huang 257165dbaf 模式二中添加课程定配 2016-06-02 21:32:56 +08:00
huang 91ae3d8b39 Merge branch 'develop' into hjq_beidou 
Conflicts:
	db/schema.rb
 2016-05-31 18:38:05 +08:00
huang afedaf3fe5 组织资源历史版本下载权限问题 2016-05-27 10:48:28 +08:00
huang 7b6a62e972 历史版本下载403问题 2016-05-27 10:34:57 +08:00
huang d1e11d4260 代码审查后代码简化 2016-05-25 08:58:58 +08:00
huang eead7962cf 资源申请权限控制 2016-05-21 11:39:50 +08:00
huang b0e4ed5ab3 请求分享如果自己在项目的话则不需要申请 2016-05-20 17:40:18 +08:00
huang 13ac7ef273 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-05-20 15:37:02 +08:00
cxt 6aa20c9edf 消息通知的内容没有过滤用Tab键空格引起的特殊符号 2016-05-20 11:12:37 +08:00
huang 3985c190bf Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-19 16:01:07 +08:00
cxt 0f2f4717b6 作业列表增加序号和翻页、按创建时间倒排 2016-05-19 13:50:45 +08:00
huang 11bc6b1e6c 配置500问题 2016-05-17 10:18:24 +08:00
huang 5ee6c9e5d3 子域名添加成员问题 2016-05-16 18:08:05 +08:00
guange f217b3f510 去除用户名域名 2016-05-14 16:00:04 +08:00
huang 33a3b22430 Merge branch 'hjq_beidou' into develop 
Conflicts:
	db/schema.rb
	public/stylesheets/org2.css
 2016-05-13 15:12:26 +08:00
cxt 0f61994252 点击作业动态优秀排行中学生链接，在打开的作品列表中自动定位到该学生作品并默认打开该作品 2016-05-12 17:49:07 +08:00
huang 6474444cc7 用户连接 id变成用户名 2016-05-10 09:00:59 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-05-06 22:02:22 +08:00
cxt b8f7672424 项目动态的更新时间更新到作业动态中 2016-05-06 22:02:45 +08:00
huang 0a989daf31 Merge branch 'cxt_course' into develop 
Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css
 2016-05-06 18:12:08 +08:00
cxt 10d26f89d9 作业列表的二级回复 2016-05-06 17:36:28 +08:00
huang 9e0176bc55 Merge branch 'hjq_beidou' into develop 
Conflicts:
	app/controllers/organizations_controller.rb
	app/helpers/organizations_helper.rb
	db/schema.rb
	public/images/homepage_icon.png
	public/stylesheets/new_user.css
 2016-05-06 10:16:56 +08:00
huang 0b43fb5502 隐藏可见及箭头的局部刷新 2016-05-06 09:49:15 +08:00
huang 231f8f3526 二级目录中设置了隐藏，鼠标经过的时候不显示内容及 框框 2016-05-05 21:23:34 +08:00
huang 5e8ff06140 Merge branch 'yuanke' into develop 2016-05-03 17:15:46 +08:00
cxt 1cad1626e0 解决冲突 2016-04-29 20:31:31 +08:00
yuanke b199a6b8b2 列表人气排序修改 2016-04-29 19:24:20 +08:00
yuanke 1353c27f64 Merge branch 'yuanke' into develop 
Conflicts:
	app/helpers/application_helper.rb
 2016-04-29 15:54:37 +08:00
yuanke f8abd46ae9 列表修改 2016-04-29 15:52:44 +08:00
yuanke 1da8288fe7 列表显示修改 2016-04-29 13:42:58 +08:00
yuanke 4258790453 Merge branch 'hjq_beidou' into yuanke_1 
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
 2016-04-27 14:30:28 +08:00
cxt da73d2b004 Merge branch 'cxt_course' into develop 2016-04-22 12:40:20 +08:00
cxt 9b4c275869 作品动态添加追加附件功能 2016-04-22 11:27:30 +08:00
huang cccc2a7eb7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-04-21 16:21:49 +08:00
cxt 06f15735fe Merge branch 'weixin_guange' into develop 2016-04-20 15:15:54 +08:00
cxt ef987d6bf7 模板消息中有html标签 2016-04-20 10:44:54 +08:00
huang adc17c5038 代码优化 
文件目录动态获取接口
文件目录显示样式
 2016-04-19 09:34:55 +08:00
huang 8064fe6c46 讨论区新建帖子代码优化 2016-04-18 15:37:32 +08:00
huang acf4e15f09 统计数左侧刷新 2016-04-14 10:26:25 +08:00
huang 2162d7d4b8 组织banner上传功能 2016-04-06 10:40:38 +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
ouyangxuhua b581a13736 Merge branch 'develop' into ouyangxuhua 2016-03-25 15:32:38 +08:00
alan 13e265b7d2 优化 layouts/_user_projects 和 layouts/_user_courses页面 2016-03-23 18:25:50 +08:00
ouyangxuhua 1579a86f9f 老师给学生的作品打分后，学生再次编辑，要给老师和助教发消息提示 2016-03-23 17:19:25 +08:00
ouyangxuhua 84703a3e01 组织配置中的添加成员，链接使用https://www形式 2016-03-18 16:35:36 +08:00
ouyangxuhua b5964fba0b 组织超链接问题 2016-03-18 14:44:39 +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 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
ouyangxuhua baf547417e 组织下的链接用Setting.protocol表示协议 2016-03-16 14:57:32 +08:00
ouyangxuhua ea6de1407e Merge branch 'develop' into ouyangxuhua 
Conflicts:
	app/helpers/application_helper.rb
 2016-03-16 12:36:15 +08:00
ouyangxuhua dcadadae03 退出和用户的链接使用https:// +Setting.host_name 2016-03-16 11:24:55 +08:00
ouyangxuhua da1b27cd38 Merge branch 'ouyang' of https://git.trustie.net/jacknudt/trustieforge into ouyang 2016-03-16 10:01:42 +08:00
cxt 2ce2134f0b 浏览器tab的title，显示用户姓名，不是登录名 2016-03-15 17:25:46 +08:00
ouyangxuhua b716e593b5 组织下的链接问题 2016-03-15 13:49:44 +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
ouyangxuhua 402b0e9c24 域名都使用Setting.host_name获取主机名 2016-03-14 23:15:08 +08:00
ouyangxuhua 15dfaf67b2 测试版环境，登陆注册改成https://test.forge. 2016-03-14 18:29:50 +08:00
ouyangxuhua a2e6f0ee5f 1.登陆退出使用www;2.对于有多个标签的组织资源，过滤条件中的“其他”应该显示 2016-03-14 15:39:45 +08:00
ouyangxuhua a7312a6191 修改游客下载组织资源的权限 2016-03-14 14:43:30 +08:00
ouyangxuhua f496761325 将is_default_field方法放到application_helper.rb中，避免报错；退出链接不带子域名 2016-03-14 11:00:55 +08:00
ouyangxuhua 766569afa6 1.组织下的课程作业，设置评分等按钮点击没反应的问题修复；更新项目/课程的活动，相应地更新组织的活动的更新时间 2016-03-10 16:43:50 +08:00
ouyangxuhua f917e96a12 组织栏目中的链接的url更新 2016-03-10 12:47:10 +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 f469e51202 课程模块/通知、作业、留言、发帖，删除的时候统计数字递减 2016-03-08 17:38:38 +08:00
ouyangxuhua 5d1d56fbb3 组织下链接改成https://www.形式 2016-03-08 16:44:03 +08:00
ouyangxuhua 6e21229b4c 组织用户链接 2016-03-08 15:22:56 +08:00
ouyangxuhua 4442d286ce 组织下的用户连接改成https://www.……形式 2016-03-08 15:20:38 +08:00
ouyangxuhua ce187b4212 组织资源下载权限控制 2016-03-07 17:18:01 +08:00
huang d54609075b 区分新闻和新闻回复得分 2016-03-05 04:01:10 +08:00
huang f381784a3c 数据迁移 2016-03-05 03:13:58 +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 085729f91b 课程活跃度中添加作业留言得分 2016-03-03 18:51:28 +08:00
cxt 050257e885 作业添加挂起的状态 2016-03-03 17:24:07 +08:00
huang a7470e059d 历史版本提供附件下载功能 2016-02-20 16:19:35 +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
guange d6e248805f changeset_num nil问题 2016-02-02 11:37:48 +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 8358140c87 问题跟踪目标版本字体修改 2016-01-29 17:02:25 +08:00
ouyangxuhua dc3278274d 修改kindeditor的工具栏 2016-01-29 16:55:07 +08:00
huang 58b5dbdf9a 版本库最近一次提交时间存入数据库 
精品课程数据迁移
 2016-01-22 18:00:01 +08:00
huang 2947ff8997 精品课程数据迁移 2016-01-22 16:46:23 +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
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
huang f3b5f4e5f7 修改浏览器tab页通过不同的模块展示不同内容 2016-01-20 16:58:41 +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
ouyangxuhua d0c2eabddd 未登陆情况下，也能下载组织下的文件 2016-01-19 16:42:10 +08:00
huang ef0a2a54c5 精品课程推荐 2016-01-18 15:48:26 +08:00
huang f52b0c1cc6 标记精品课程，精品课程推荐 2016-01-18 10:16:29 +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
huang 86516df88a Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course 
Conflicts:
	app/helpers/application_helper.rb
 2016-01-15 15:41:02 +08:00
huang 49d456bf21 修改数据统计信息 2016-01-14 14:32:19 +08:00
huang 4b26e77478 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/models/issue.rb
	app/models/message.rb
	app/models/news.rb
处理冲突
 2016-01-13 16:28:00 +08:00
huang 24df6d30d6 项目得分弹出页面 2016-01-13 16:15:46 +08:00
huang 05cf2d24dc 新项目积分系统 
讨论区回复加入得分系统
版本库行号显示错误问题
 2016-01-13 15:29:29 +08:00
cxt b48a2848b0 首页、课程、项目、组织动态增加更新时间 2016-01-12 15:53:15 +08:00
huang 83881766b2 提交总数接口获取修改 2016-01-12 11:01:58 +08:00
huang 8c10ce6fee 修改组织500问题 2016-01-08 21:47:42 +08:00
huang 5b9be0bb11 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
	public/stylesheets/public.css
 2016-01-08 18:11:54 +08:00
cxt 151c08ac5c 复制学期 2016-01-07 15:29:25 +08:00
huang d0a8b4bc18 项目资源云搜索 2016-01-06 18:07:35 +08:00
huang 81bb35ac49 项目资源库 资源列表 2016-01-05 10:01:56 +08:00
lizanle be146a9421 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-12-31 11:11:38 +08:00
lizanle 3b08adfc68 课程资源页面修改。 2015-12-27 23:24:21 +08:00
huang a92d33300b 里程碑 添加 “已解决”，区分已解决和已关闭 2015-12-24 17:18:52 +08:00
huang f7f03b2094 0 2015-12-24 16:10:41 +08:00
huang 8639609832 切换分支--暂时待处理 2015-12-24 15:42:05 +08:00
guange 57b1c0c7d8 at是否开启加入到配置 2015-12-18 17:02:50 +08:00
guange d703f75c98 merge 2015-12-18 09:23:52 +08:00
guange eb97f7dfb2 merge 2015-12-18 09:20:51 +08:00
huang 5259831224 Merge branch 'szzh' into hjq_new_course 2015-12-18 09:17:49 +08:00
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle 2015-12-17 18:17:38 +08:00
ouyangxuhua ef46191c80 Merge branch 'szzh' into dev_hjq 2015-12-17 17:42:48 +08:00
ouyangxuhua de229c0f1c 组织资源栏目的文件可以被引用至当前组织下的资源栏目 2015-12-17 14:51:02 +08:00
huang bb23049f55 版本库提交次数封装 
提交页面样式修改
 2015-12-16 17:04:17 +08:00
lizanle ef2f142f62 论坛资源允许下载 2015-12-15 18:12:32 +08:00
ouyangxuhua af157a9c63 组织资源栏目增加标签功能 2015-12-15 17:30:24 +08:00
lizanle 88c2db47b7 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/helpers/application_helper.rb
 2015-12-15 08:48:08 +08:00
guange 4f57e48b92 merge 2015-12-14 18:20:32 +08:00
guange d1315e35b5 merge 2015-12-14 17:26:40 +08:00
guange f61f639af2 转换为remote js 2015-12-14 17:13:57 +08:00
lizanle c5f903146d 博客资源下载问题 2015-12-14 11:19:43 +08:00
lizanle 14912078ee 博客资源允许下载 2015-12-14 11:03:04 +08:00
cxt 42f0fc62e9 分组成员不能修改作品 2015-12-11 18:07:30 +08:00
cxt f880ccd749 分组作业 2015-12-11 14:57:09 +08:00
cxt 4e04df7a8a 分组作业的动态显示及关联项目 2015-12-09 16:33:48 +08:00
cxt 53f9141cf1 分组作业动态 2015-12-09 10:29:54 +08:00
guange 3476731b83 将at js data整合到文件中 2015-12-09 09:59:13 +08:00
cxt a9f6e817b4 分组作业关联项目 2015-12-08 17:37:15 +08:00
guange 1a2aff99be 调整显示的格式 2015-12-07 14:18:01 +08:00
cxt 79ce5c9ac5 匿评已结束时作业动态的作品按钮显示成“查看作品” 2015-12-07 11:31:37 +08:00
guange af31946586 issue列表开启AT功能 2015-12-06 15:03:12 +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 042b197767 课程英雄榜界面调整 
动作触发的时候更新总分
更换迁移顺序
 2015-11-27 10:49:41 +08:00
huang aca7684414 课程英雄榜 
各模块动作 触发加分
 2015-11-26 18:22:03 +08:00
lizanle 4efb660214 全站搜索 2015-11-26 09:57:53 +08:00
cxt e22b4cbdeb 作业提交截止后，未提交作品的学生看到的作业动态将显示“补交作品” 2015-11-16 10:44:27 +08:00
ouyangxuhua 78e1ae4188 Merge branch 'szzh' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-11-13 17:27:33 +08:00
lizanle b24fadea05 设置 删除 编辑按钮做成项目一样的 2015-11-12 19:15:35 +08:00
cxt 5d03a27170 启动匿评和关闭匿评时自动刷新该动态 2015-11-06 14:57:39 +08:00
ouyangxuhua 283af137c6 组织模块动态及配置 2015-11-05 17:57:07 +08:00
cxt 8e3b04f9e3 禁用匿评&&作业截止&&作品已提交 学生可查看所有作品列表 2015-11-05 16:43:12 +08:00
cxt 41f53ad4e0 作业截止后不可再修改作品 2015-11-05 16:25:40 +08:00
huang 1c45afac89 增加提示 
修改链接参数
 2015-11-02 19:14:55 +08:00
huang 83486c745e 1、如果没有新增版本库，点击链接跳至配置--新增 
2、已创建过gitlab项目则跳至gitlab 版本库
 2015-11-02 15:04:17 +08:00
cxt d851364e70 匿评开启前学生能看到提交的作品数 2015-10-28 14:22:17 +08:00
cxt 717baed23b 匿评结束后动态和作业列表中的“作品匿评”改为“匿评结束” 2015-10-23 09:19:19 +08:00
huang 178752ba8f 将“作品”改成“提交” 2015-10-16 15:42:10 +08:00
huang 07ff8d2eb7 老师，非课程成员 课程动态中显示 -- 提交（作品数） 2015-10-16 15:23:34 +08:00
huang c11905707d 非课程成员 --课程动态中不显示 提交 ，匿评等信息 2015-10-15 15:43:40 +08:00
huang 0945fecee6 匿评开启后，显示“作品匿评”，点击进入匿评作业列表 2015-10-15 15:20:40 +08:00
sw 33924680b2 修改开启匿评提示 2015-09-25 15:02:56 +08:00
sw 709e099770 增加部分作业关联表的判断 2015-09-25 14:33:33 +08:00
sw 6807f649bf 1、作品列表头像显示全部一样 
2、匿评作业开启匿评之后学生可以在作业列表修改作业
 2015-09-24 16:17:50 +08:00
sw d727097ed2 1、已开启匿评代码没有匿评设置功能 
2、匿评结束不显示
 2015-09-23 17:33:06 +08:00
sw 5313bf0e3d 具体课程作业列表中也应该看到编程作业的匿评状态 2015-09-19 10:48:37 +08:00
cxt 20ea692260 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-09-18 14:31:33 +08:00
cxt 154cd7de6f 子域名的更改 2015-09-18 14:31:19 +08:00
sw 9d9ed24d1b 111 2015-09-18 13:51:37 +08:00
sw 281e97e468 课程内老师可以对作业进行编辑、删除、开启匿评 2015-09-18 12:00:04 +08:00
sw 4b83265508 1、编程作业可以修改、删除 
2、关闭匿评之后结束匿评按钮样式
3、编程作业成绩计算有问题
4、相关样式修改
5、编程作业作品展开界面功能
 2015-09-18 11:05:21 +08:00
sw 5f08ecc7e3 1、作业的开启匿评、关闭匿评功能 
2、提交作品时，迟交扣分、缺评扣分的计算--->改为只计算数量
3、
 2015-09-16 10:26:13 +08:00
sw 30ebe9b2d5 1、编程作业可以开启匿评 
2、取消扣分标准的显示
 2015-09-11 09:59:34 +08:00
sw b1463f0864 学生提交匿评作业作品功能实现 2015-09-09 16:10:11 +08:00
guange 216bc7f70f 动态中作业的提交状态修改 2015-09-06 22:59:27 +08:00
guange 6063f39eac 修改作业的一些链接和跳转问题 2015-09-03 16:58:38 +08:00
huang 487881bb92 Merge branch 'szzh' into dev_hjq 
Conflicts:
	public/stylesheets/new_user.css
 2015-09-02 14:15:38 +08:00
huang 0e4019be2f 修复时间乱的问题 2015-09-02 10:23:22 +08:00