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

7568 Commits

Author SHA1 Message Date
cxt f0216cf604 Merge branch 'cxt_course' into szzh 2015-12-31 17:53:52 +08:00
cxt 3dac8d2944 课程/项目帖子的编辑/删除跳转 所有用户都有发送帖子的权限 2015-12-31 17:53:05 +08:00
huang 0541294c33 为解决完： 
1、user_message_system附件显示问题
2、issue回复添加附件问题
 2015-12-31 17:08:27 +08:00
lizanle 87b8e4dafc Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-31 17:07:04 +08:00
lizanle b06bd51347 项目资源库更新资源公开私有属性的时候 需要区分 项目课程 2015-12-31 17:06:49 +08:00
ouyangxuhua 692f13d1de Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-31 16:12:19 +08:00
ouyangxuhua defba80427 栏目配置中，“设为显示”改成“设为可见" 2015-12-31 16:11:48 +08:00
lizanle a82fef3ea2 资源库新上传资源不能被删除 2015-12-31 16:08:46 +08:00
lizanle d26b51c982 Merge branch 'szzh' into dev_zanle 
Conflicts:
	app/controllers/organizations_controller.rb
	db/schema.rb
 2015-12-31 15:44:57 +08:00
cxt 9b974b6170 Merge branch 'cxt_course' into szzh 
Conflicts:
	db/schema.rb
 2015-12-31 15:39:07 +08:00
cxt 7e76a32480 项目/课程讨论区的动态增加设置菜单 2015-12-31 15:36:42 +08:00
ouyangxuhua 358510a2e6 解决组织配置资源栏目中，增加/删除栏目不能更新的问题 2015-12-31 14:55:41 +08:00
ouyangxuhua 373e40f4fd 未登陆情况下，不能发布帖子 2015-12-31 14:13:31 +08:00
ouyangxuhua 22be66f85c 课程/项目帖子中，用户在登陆情况下即可发送帖子 2015-12-31 14:00:33 +08:00
ouyangxuhua 806e4caf5a 1.增加隐藏组织栏目功能；2.未登录情况，隐藏部分内容。 2015-12-31 13:26:28 +08:00
lizanle 2c7ef034cb 资源库更改 2015-12-31 12:27:31 +08:00
cxt 2c5a4f8a13 发布和编辑作业时的启用匿评改为禁用匿评，默认不选中 2015-12-31 11:36:21 +08:00
cxt ec631691e3 新建课程和课程配置页面增加结束学期 2015-12-31 11:12:09 +08:00
lizanle 20a03b2386 点击展开更多 2015-12-31 11:12:00 +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
ouyangxuhua 2271befedd 修正组织部分页面的样式 2015-12-31 09:50:41 +08:00
ouyangxuhua c2578698f5 1.组织管理员有权限访问帖子资源栏目 
2.解决组织页面下的帖子样式的bug
 2015-12-30 18:25:56 +08:00
lizanle a85a3339bb 文件的删除限制加大 
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
 2015-12-30 18:24:07 +08:00
lizanle c34127f21f 文件的删除限制加大 
如果文件有了历史版本 数据记录不能被删除
如果文件被发送过，或者有了历史版本，硬盘上的文件和数据记录就不能被删除
 2015-12-30 18:04:04 +08:00
ouyangxuhua 29c720a8a4 1.权限管理问题 2015-12-30 17:45:15 +08:00
ouyangxuhua 82b8cb77fd Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 17:28:04 +08:00
cxt 1448c4f90e Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 17:28:34 +08:00
lizanle b7eda83def 历史资源功能 2015-12-30 17:27:44 +08:00
ouyangxuhua c2c4c032dc Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 17:27:22 +08:00
ouyangxuhua 987b0dd9d2 message_id为空的动态不显示 2015-12-30 17:02:14 +08:00
ouyangxuhua c16f99774b 1.组织叶底样式错误问题修正 2015-12-30 16:57:40 +08:00
Tim 077368f597 匿评增加系统评分显示，对应样式调整 2015-12-30 16:02:31 +08:00
ouyangxuhua dcfe89c544 帖子发送到组织资源栏目，同时增加增删查改功能 2015-12-30 15:46:01 +08:00
cxt 9348cc9c24 编程作业匿评添加系统评分 2015-12-30 15:22:26 +08:00
guange aa951cd7b9 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-30 13:18:40 +08:00
guange 941d6d09d5 查看代码在firefox中显示不了的问题 2015-12-30 13:18:30 +08:00
ouyangxuhua d1ebc35e43 Merge branch 'develop' into dev_hjq 
Conflicts:
	db/schema.rb
 2015-12-30 10:37:28 +08:00
huang 4f331d95c7 课程讨论区、项目讨论编辑的时候显示附件信息不一致问题 2015-12-30 10:08:59 +08:00
lizanle fd4d2910d0 课程发送资源 以及 项目发送资源 2015-12-30 10:00:45 +08:00
huang aa87ef6f1b 解决Chrome浏览器等比缩放后样式错乱问题 2015-12-30 09:40:15 +08:00
lizanle 1d0e6e1c5c 课程发送资源 以及 项目发送资源 2015-12-30 09:37:16 +08:00
huang 6b4b87ed09 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/organizations/_org_left_subfield_list.html.erb
处理冲突
 2015-12-29 18:14:22 +08:00
huang 743950d264 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 18:13:15 +08:00
huang 0763963ca4 格式 2015-12-29 18:12:14 +08:00
ouyangxuhua 2cd48a1ca2 暂时隐藏帖子发送功能 2015-12-29 18:09:27 +08:00
lizanle 659f322ca2 send resource to org 2015-12-29 17:58:36 +08:00
lizanle c425106d0b 目标地址样式修改 2015-12-29 17:26:45 +08:00
ouyangxuhua d203285cc1 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/organizations/_org_left_subfield_list.html.erb
 2015-12-29 17:18:21 +08:00
ouyangxuhua f9de793124 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-29 17:14:13 +08:00
ouyangxuhua 15cff47c92 1.转发帖子时，当组织没有资源栏目时，给出提示； 
2.组织文章的附件显示在组织动态/组织文章列表中；
 2015-12-29 17:13:48 +08:00
lizanle abb19422ff 发送资源到组织功能。同时个人资源库也要添加这个功能 2015-12-29 17:13:01 +08:00
ouyangxuhua 0cf2279cf5 解决一下bug: 
1.组织：引用资源至某栏目，若该组织只有一个栏目，且该资源已成功引用至该组织栏目，如图就不要再显示为“选入组织其他栏目”了
2.组织:只有管理员才能关联课程/项目
 2015-12-29 16:46:20 +08:00
huang 5618fe067a 项目分页，点击加载 2015-12-29 16:40:07 +08:00
cxt c3ddbcfddf Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-29 16:33:32 +08:00
cxt 5d2c760a8e Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-29 16:32:35 +08:00
cxt 605ec52f8a 测验答题失败时提示网络异常 2015-12-29 16:31:19 +08:00
ouyangxuhua dd88742b78 判断org.org_act_id是否为空 2015-12-29 16:00:12 +08:00
ouyangxuhua 58edc150e6 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-29 15:50:42 +08:00
ouyangxuhua 2e41e9890a 将riserved改成reserved 2015-12-29 15:50:29 +08:00
ouyangxuhua 77e0f0cd08 转发帖子新建帖子，并更新相关表 2015-12-29 15:49:24 +08:00
huang d6e765cf4a 修正讨论区删除跳转 2015-12-29 15:46:20 +08:00
huang 41cd038758 讨论区帖子添加锁定 2015-12-29 15:05:07 +08:00
cxt 179058f1aa 学生总成绩不能为负分 2015-12-29 14:55:20 +08:00
huang b6cf709696 解决讨论区冲突 2015-12-29 11:29:43 +08:00
huang c29e6f1b14 Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	app/views/boards/_project_show.html.erb
	app/views/boards/_project_show_detail.html.erb

解决冲突
 2015-12-29 11:09:16 +08:00
cxt e6ebcb7ac6 作品列表页面的截止时间改为提交截止时间/匿评截止时间 2015-12-29 11:08:38 +08:00
huang 5060ec26bb 项目讨论区 2015-12-29 11:04:20 +08:00
cxt 000f40ad42 作业动态的截止时间根据作业当前所处状态来确定是提交截止时间还是匿评截止时间 2015-12-29 10:59:26 +08:00
cxt 6bdd6d3e03 课程添加设置菜单，设置页面的信息更改 2015-12-29 10:15:53 +08:00
ouyangxuhua 0d98dba25c 解决项目新建帖子中，点击取消按钮没有反应的问题 2015-12-29 09:53:44 +08:00
lizanle 6440434428 私有课程的资源不允许设置为公开 2015-12-28 17:26:29 +08:00
ouyangxuhua 33ea55ecca 项目/课程帖子发送弹窗样式修改 2015-12-28 17:03:13 +08:00
lizanle 174f7c1972 Merge remote-tracking branch 'origin/szzh' into szzh 
Conflicts:
	app/views/issues/_list.html.erb
 2015-12-28 16:57:05 +08:00
lizanle 5ce9a5109d issue存在重复 2015-12-28 16:55:46 +08:00
lizanle e35d2daa0a 课程资源库 2015-12-28 16:19:30 +08:00
ouyangxuhua 2076c9b449 Merge branch 'develop' into dev_hjq 
Conflicts:
	app/controllers/organizations_controller.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/base_org.html.erb
	app/views/organizations/_org_activities.html.erb
	db/schema.rb
	public/stylesheets/new_user.css
	public/stylesheets/org.css
	public/stylesheets/public.css
 2015-12-28 15:32:03 +08:00
cxt c821826bd8 附件描述-》追加理由 2015-12-28 15:17:16 +08:00
huang af9bc9a124 解决版本库点击新增版本版本信息丢失 2015-12-28 15:09:41 +08:00
huang 77722f0211 修改issue中ke高度 2015-12-28 14:52:36 +08:00
cxt 7bc030b789 组织模块：关联项目弹框的项目列表的高度要限制 2015-12-28 11:31:23 +08:00
lizanle 3b08adfc68 课程资源页面修改。 2015-12-27 23:24:21 +08:00
cxt b991dc1edd Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 19:02:34 +08:00
huang ce740170ca Merge branch 'hjq_new_course' into szzh 
Conflicts:
	public/stylesheets/public.css

处理冲突
 2015-12-25 18:05:36 +08:00
huang cd36a6874e 修改issue动态错位 2015-12-25 18:03:32 +08:00
cxt 8ed01bf572 issue列表报500 2015-12-25 17:16:47 +08:00
cxt f63f38fb82 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 17:07:34 +08:00
cxt bca503f171 追加附件必须填写描述 2015-12-25 17:07:27 +08:00
Tim 445d5dc379 组织下拉菜单修改 2015-12-25 16:30:09 +08:00
huang 801651cba6 解决组织两个footer冲突问题 2015-12-25 16:16:06 +08:00
huang 533be61cf7 添加底部样式 2015-12-25 16:13:17 +08:00
huang 5d1b63d6fa Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 16:05:07 +08:00
huang 7412c1caf6 添加footer 2015-12-25 16:04:49 +08:00
cxt 11bf8f77dc Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 15:59:33 +08:00
cxt 7f133c860a 发布和编辑作业时可设置是否启用匿评 2015-12-25 15:57:30 +08:00
huang a16d6803ae Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-25 15:48:41 +08:00
huang f4fc978b23 课程留言bug 2015-12-25 15:47:22 +08:00
Tim 06b89c5108 Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq 2015-12-25 15:28:15 +08:00
Tim 1a24505eac footer新增图片，样式修改 2015-12-25 15:27:45 +08:00
cxt b8d8cece02 关联项目的样式修改 2015-12-25 14:56:08 +08:00
cxt aa653d558f 作品确认弹框的按钮样式调整 2015-12-25 11:26:48 +08:00
cxt ce5f0eb855 关联项目的样式修改 2015-12-25 11:00:41 +08:00
huang e7a109d28f Merge branch 'develop' into hjq_new_course 2015-12-25 10:40:40 +08:00
cxt 3e39eacd19 新建课程通知时通知标题框自动获取焦点 2015-12-24 16:45:45 +08:00
ouyangxuhua 7d7d9b77b5 编辑项目帖子样式改成方块样式 2015-12-24 11:58:00 +08:00
cxt 20efe4de41 去掉测验结果页面中填空题的标准答案 2015-12-24 11:30:52 +08:00
cxt 61b5cf41d0 取消课程首页的开设单位超链接 2015-12-24 11:23:23 +08:00
ouyangxuhua c81f2f738a Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq 
Conflicts:
	app/controllers/org_document_comments_controller.rb
	app/views/org_document_comments/_attachment.html.erb
 2015-12-24 11:13:20 +08:00
ouyangxuhua 59f42bb54f 1.将添加附加功能加入到组织列表中的新建组织文章； 
2.解决编辑文章附件不能上传的问题。
 2015-12-24 11:09:57 +08:00
Tim b0b4527ea1 Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq 
Conflicts:
	public/stylesheets/org.css
 2015-12-24 10:40:00 +08:00
Tim eb7d0761cb 组织菜单栏修改成和个人首页相同 2015-12-24 10:37:13 +08:00
cxt 24542105f4 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2015-12-24 09:57:47 +08:00
cxt f26f71c07a 课程通知改成动态的模式 2015-12-24 09:57:32 +08:00
ouyangxuhua 9e0b88c186 项目讨论区样式改成方块样式 2015-12-24 09:46:18 +08:00
Tim c405950469 课程关联项目列表显示调整 2015-12-23 17:26:13 +08:00
huang 19f84b111b 邮件按天发送去掉token值 2015-12-23 17:16:35 +08:00
ouyangxuhua 73d377d06d 组织资源栏目显示转发的帖子 2015-12-23 16:49:05 +08:00
huang 00711f1100 issue编辑、添加邮件中去掉token 2015-12-23 16:12:23 +08:00
ouyangxuhua b9ae579622 将课程帖子转发至组织帖子栏目 2015-12-23 15:35:26 +08:00
lizanle e8bf93e4ad 文件上传button的路径去掉project参数。 2015-12-23 11:13:14 +08:00
lizanle 7688546e7a 论坛编辑的时候上传文件后没有显示 2015-12-23 11:12:34 +08:00
ouyangxuhua 9dc2cb8541 添加组织文章附件功能 2015-12-23 10:40:50 +08:00
lizanle 2eca28a10d LastName 姓 
FirstName 名
 2015-12-23 10:02:54 +08:00
cxt 1623d846f4 动态的展开更多改成点击展开更多 2015-12-22 15:14:03 +08:00
huang 0e68266f49 版本库显示调整 2015-12-22 10:59:09 +08:00
cxt 6f12ba883d 学生作品列表的tag显示不对 2015-12-22 09:49:18 +08:00
cxt c8760445ab Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2015-12-21 17:00:28 +08:00
cxt a5cc1390f2 学生匿评打分时必须填写评语 2015-12-21 17:00:01 +08:00
huang 471e5f5370 Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course 2015-12-21 16:29:58 +08:00
houxiang 3e57237969 修改了整个提交记录总数，运用了黄总的修改的gitlab API by 侯翔 2015-12-21 16:21:39 +08:00
lizanle 31cbf3fbce onchange函数去掉 2015-12-21 11:19:34 +08:00
lizanle 60381fded5 表单长度对齐 2015-12-21 11:14:27 +08:00
lizanle 480775f2b9 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-21 09:27:17 +08:00
lizanle 538c64329f issue的修改 2015-12-21 09:26:56 +08:00
cxt 65022f03cb 作业动态中的评分设置和匿评自动开启、关闭时间的自动刷新 2015-12-18 21:34:31 +08:00
cxt c073e56b79 学生匿评必须添加评语 2015-12-18 20:46:20 +08:00
cxt e7db03f271 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 19:49:42 +08:00
cxt 459e1f332b 编辑分组作品时如果不修改分组成员则不能提交 2015-12-18 19:48:13 +08:00
guange e9a45012f8 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 19:47:21 +08:00
guange 08cd3808ad ke引用错误 2015-12-18 19:47:06 +08:00
cxt 6a563d4256 匿评结束后不可修改作业的截止日期，作业发布后不可修改作业的发布日期 2015-12-18 18:47:36 +08:00
lizanle a657a5b98d 课程留言 重复提交问题 2015-12-18 18:09:20 +08:00
cxt 902570173d Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 18:09:00 +08:00
lizanle a1d0bf43ee Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-18 17:55:21 +08:00
lizanle 009dc089f0 资源库重命名修改 2015-12-18 17:55:15 +08:00
cxt 8769d6af4f Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 17:28:59 +08:00
cxt 108448cf4d 课程讨论区的加载更多 2015-12-18 17:28:47 +08:00
huang ea51b24a4e Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 17:06:00 +08:00
guange f4d861c727 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 16:51:17 +08:00
guange d0e139650f issue回复的at出错 2015-12-18 16:50:44 +08:00
cxt 63f9601c15 Merge branch 'cxt_course' into szzh 2015-12-18 16:27:31 +08:00
guange c38191eb42 问题回复at 2015-12-18 16:25:14 +08:00
cxt 7ce8e330c3 课程留言动态的显示 2015-12-18 16:21:27 +08:00
huang a080306f75 解决课程动态中，点击按钮，提交多次的问题 2015-12-18 16:05:39 +08:00
lizanle 0ed7d84914 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-18 15:22:35 +08:00
lizanle 084844941f 个人单位修改。 
聚焦就搜索所有的学校
 2015-12-18 15:22:29 +08:00
cxt 2eaa05306f Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	app/views/boards/_course_show.html.erb
 2015-12-18 15:08:38 +08:00
cxt ba4c93e4c4 Merge branch 'cxt_course' into szzh 2015-12-18 15:03:24 +08:00
cxt a7c006c59f 课程讨论区的展开更多不可用 2015-12-18 15:02:36 +08:00
huang 8a53978d23 项目得分更新 2015-12-18 14:51:33 +08:00
lizanle eb02a3d34a Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-18 14:38:10 +08:00
lizanle 70f93741d6 issue图标问题 2015-12-18 14:38:04 +08:00
ouyangxuhua b3b5bc7ffd Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 14:30:43 +08:00
ouyangxuhua 85bc9ce43d 解决组织模块的一些bug 2015-12-18 14:30:25 +08:00
cxt c230ff5bed 普通作业提交报500 2015-12-18 13:16:01 +08:00
cxt ca77af9221 作业动态添加扣分规则 2015-12-18 13:13:23 +08:00
cxt b65e84d166 未答测验的学生在测验截止时间到了后算作零分 2015-12-18 12:47:34 +08:00
lizanle 06734d86ca attachment_acts页面变量错误 2015-12-18 11:19:55 +08:00
guange 39ad191dd0 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 10:41:06 +08:00
guange b4016faeb6 编辑框消失 2015-12-18 10:40:12 +08:00
cxt 2faddd7d75 分组设置中的基于项目实施默认勾选 2015-12-18 10:00:26 +08:00
lizanle f3f64b8655 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-18 09:46:35 +08:00
lizanle 5d47afdc43 issue 删除回复的权限问题 2015-12-18 09:46:28 +08:00
huang b34b1181b7 Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-18 09:39:55 +08:00
huang 4ca177970b fork点击提示 2015-12-18 09:39:36 +08:00
lizanle 38c3422b83 Merge remote-tracking branch 'origin/szzh' into szzh 2015-12-18 09:28:41 +08:00
lizanle 0659015ada issue 多了一个提交按钮和时间显示 2015-12-18 09:26:35 +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
huang b87943ff1d Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh 
Conflicts:
	db/schema.rb
处理冲突
 2015-12-18 09:17:18 +08:00
guange b69f5f0da3 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 22:36:33 +08:00
guange c98e9fc639 查看作业代码着色 2015-12-17 22:36:18 +08:00
cxt 0ed58d4898 Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh 2015-12-17 19:07:17 +08:00
cxt 3b25616f0c 编辑作品时可编辑分组成员 2015-12-17 19:06:10 +08:00
lizanle 5f8c04e3a0 Merge branch 'szzh' into dev_zanle 2015-12-17 18:17:38 +08:00
lizanle 8ce2dbc4b8 issue回复 2015-12-17 18:12:38 +08:00
ouyangxuhua ef46191c80 Merge branch 'szzh' into dev_hjq 2015-12-17 17:42:48 +08:00
lizanle 1dbccd81d6 issue回复的删除功能 2015-12-17 17:15:03 +08:00
lizanle 1809a93770 editor修改 2015-12-17 15:41:36 +08:00
cxt a2ebaa0729 分组作业提交作品时如果关联了项目则从项目成员中添加分组成员 2015-12-17 15:28:28 +08:00
lizanle 505d1b5546 editor修改 2015-12-17 15:19:29 +08:00
lizanle 4bc68081ee editor修改 2015-12-17 15:15:00 +08:00
guange fc63dfcb7b 消息通知 2015-12-17 15:14:52 +08:00
ouyangxuhua de229c0f1c 组织资源栏目的文件可以被引用至当前组织下的资源栏目 2015-12-17 14:51:02 +08:00
huang 2d2329a1e0 代码定位问题 2015-12-17 14:31:55 +08:00
lizanle b02cb6fdd4 issue的修改如果更改issue的类型，那么就会有问题。需要重新新建editor 2015-12-17 11:30:52 +08:00
lizanle 31c57b78bf issue的修改如果更改issue的类型，那么就会有问题。需要重新新建editor 2015-12-17 11:28:28 +08:00
cxt 89d3d3821c 分组作业的导入 2015-12-17 10:38:14 +08:00
cxt 51e082a551 编辑和新建作品时的样式和提示信息调整 2015-12-17 10:17:13 +08:00
cxt fa0f9c6751 分组作业的编辑，若分组作业已提交了作品则不可再编辑分组设置 2015-12-17 10:16:29 +08:00