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

1547 Commits

Author SHA1 Message Date
sw 1fe7c70955 1、评价作品增加批阅结果的删除与显示 
2、修改课程的昵称下拉框无法正常显示
 2015-05-27 09:29:27 +08:00
sw 1ae8c7d234 作业评分、上传评阅结果，以及上传结果的显示样式 2015-05-26 17:51:56 +08:00
huang a6da2b4a01 项目添加新的编辑器 
显示页面显示样式调整
 2015-05-26 16:30:06 +08:00
sw f3597d9aa5 开启/关闭匿评弹框提示 2015-05-26 10:00:37 +08:00
huang 052d293f82 新建项目时候： 
如果我的项目中有重名的项目不允许新建
 2015-05-22 16:30:22 +08:00
sw 95a48b7da0 1、作品show界面详细内容填充 
2、更新public.css
3、增加作品附件显示
 2015-05-22 14:45:01 +08:00
alan 1c9b9dff79 修改《编辑器还原》《提示信息的添加》 
Signed-off-by: alan <547533434@qq.com>
 2015-05-22 13:57:07 +08:00
alan c18d1d9585 修改《匿名发布新帖》《编辑时出现跳转错误》 
Signed-off-by: alan <547533434@qq.com>
 2015-05-22 11:09:43 +08:00
sw 8c72df74d6 1、增加返回顶部功能 
2、点击作品名称，弹出详细信息
3、作品列表信息生成
 2015-05-21 17:17:54 +08:00
alan a0ca31780e 修改《帖子排序》《资源区链接错误》《增加回帖回复》《添加编辑器》 
《展开，收起，展开回复，收起回复 的样式问题》
Signed-off-by: alan <547533434@qq.com>
 2015-05-21 16:35:53 +08:00
guange 689ec5cdfc 课程通知列表更多功能bug 2015-05-21 15:57:58 +08:00
sw faeb06aae8 1、更新css文件 
2、新建作品功能天津
3、老师新建作业时增加文件的保存
 2015-05-21 15:52:27 +08:00
sw 56723d106f 新建作品功能，以及相关js验证 2015-05-21 11:58:34 +08:00
guange 7b5021c4fd Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-21 11:20:12 +08:00
alan f1f871ffda Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-20 17:40:48 +08:00
alan 4a588506a4 增加编辑器 
Signed-off-by: alan <547533434@qq.com>
 2015-05-20 17:38:40 +08:00
sw 40f6295609 1、新建作业功能完成 
2、修改新建作业时传递参数不完整
3、进入编辑作业界面，部分界面显示的初始化
4、提交新建作业按钮
 2015-05-20 16:49:19 +08:00
huang 3f744d46f2 超级管理员界面--贴吧回复成功 2015-05-20 16:24:32 +08:00
sw 296d4a678c 新建作业js验证以及页面操作js效果添加 2015-05-20 15:43:55 +08:00
sw a7fd5b950d 1、老师新建作业界面，数据i初始化 
2、部分help方法添加
 2015-05-20 15:05:35 +08:00
huang fa563b60d5 项目issue添加周报功能 2015-05-20 11:12:25 +08:00
sw 3b3ca0024d css错误修改 2015-05-19 17:46:12 +08:00
sw 09b3ba8a6a 更新css文件，新建作业静态页面 2015-05-19 17:41:19 +08:00
alan ab9d74f364 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-19 14:27:04 +08:00
alan 052868a6b4 Signed-off-by: alan <547533434@qq.com> 2015-05-19 14:26:42 +08:00
huang 6c6ae38f7a 课程主页私有样式 2015-05-19 10:19:49 +08:00
guange e3633e702c firefox样式问题 2015-05-19 08:53:51 +08:00
yutao df24007dbb 修复bug(#2525) :项目--邀请：收起“邀请”下拉框，刷新页面后又自动打开 2015-05-18 11:16:41 +08:00
guange 1226f74750 Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev 2015-05-16 10:00:37 +08:00
guange 49d836d331 上传头像大小和图片类型在后台加入限制,且通过测试 2015-05-15 23:47:22 +08:00
sw a44cba2e6a Merge branch 'develop' into guange_dev 2015-05-15 17:36:44 +08:00
guange d2a7d41963 头像加入大小限制 2015-05-15 17:35:24 +08:00
sw 659ff254e1 background背景图片拉伸 2015-05-15 17:12:01 +08:00
guange 66e2bc5ef2 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-15 16:19:13 +08:00
guange 588d96a0c0 头像上传只允许图片 2015-05-15 16:18:44 +08:00
sw a8e7590b16 Merge branch 'szzh' into guange_dev 2015-05-15 16:13:47 +08:00
sw 99e3d09e83 IE浏览器中li前面有个点 2015-05-15 15:17:47 +08:00
guange 907d89e1cc merge 2015-05-15 13:39:26 +08:00
yutao 233c68e965 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-15 11:47:57 +08:00
yutao 68cf5fa55e 修复:当1个页面存在多个上传控件时的各种bug 2015-05-15 11:45:15 +08:00
huang 7db9e2eb7f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-15 11:28:59 +08:00
huang 2fb5871058 缺陷显示新界面 2015-05-15 11:26:50 +08:00
guange e5a9d87ce1 新建贴吧如果放个图片就会撑坏版面 2015-05-15 11:18:58 +08:00
alan 372bf71ca5 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-15 10:08:12 +08:00
alan cc5738c12f 课程讨论区回复样式错误 
Signed-off-by: alan <547533434@qq.com>
 2015-05-15 10:07:52 +08:00
sw a77a572a4d Merge branch 'szzh' into guange_dev 2015-05-14 17:46:08 +08:00
guange 06b17581b1 图片撑出在firefox上的问题 2015-05-14 17:45:02 +08:00
sw 9bbae3d7ac Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/application.css
 2015-05-14 16:59:27 +08:00
sw 3dc1b2642a 发布竞赛日期选择图标有问题 2015-05-14 16:53:36 +08:00
sw c241fc00e9 测试版--课程--课程作业：如图作业附件显示与图标重叠 2015-05-14 16:48:08 +08:00
sw c129e767e5 测试版：公共贴吧：显示页数应该与虚线分开 2015-05-14 16:26:01 +08:00
huang 574e79ff57 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-14 16:06:41 +08:00
huang 725a6e4238 解决发布竞赛日历问题 2015-05-14 16:03:37 +08:00
alan 0708279c5e Signed-off-by: alan <547533434@qq.com> 2015-05-14 15:42:20 +08:00
alan 8a52225f4d Signed-off-by: alan <547533434@qq.com> 2015-05-14 15:19:15 +08:00
alan f9d9ffe4d9 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-14 15:11:36 +08:00
alan 72ef4e1db4 修改讨论区编辑是主题，内容为空时报错以及动态页面跳转问题 
Signed-off-by: alan <547533434@qq.com>
 2015-05-14 15:11:20 +08:00
sw 963a21283f 1、修改作业打分插件星星移位 
2、修改返还批改结果显示不正确
 2015-05-14 15:09:15 +08:00
guange 52217efcb6 issue中图片超出边框 2015-05-14 14:12:50 +08:00
guange d88b5dbbed Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-14 12:44:56 +08:00
guange 69afe8809e 经测试，转到rspec各方面成熟一点。 2015-05-14 11:41:50 +08:00
huang d60639f557 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-14 09:58:08 +08:00
huang aef91be36c 修复新建缺陷样式冲突 2015-05-14 09:57:13 +08:00
alan 0af8c1cc38 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-13 17:25:49 +08:00
alan bd77ad9ac1 展开。收起 
Signed-off-by: alan <547533434@qq.com>
 2015-05-13 17:25:31 +08:00
guange bb506b2ab4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
# Conflicts:
#	db/schema.rb
 2015-05-13 16:22:44 +08:00
guange 9f4d7fc033 merge 2015-05-13 16:00:35 +08:00
guange 80d44e4f4c 新版项目的上传图标问题解决 2015-05-12 17:46:54 +08:00
alan fe92b05026 讨论区编辑添加附件 
Signed-off-by: alan <547533434@qq.com>
 2015-05-12 17:14:07 +08:00
guange 092af28476 修正编辑器在火狐下粘贴不成功 2015-05-11 20:57:59 +08:00
alan ee18ba7051 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/views/boards/_course_show.html.erb
	app/views/boards/_project_show.html.erb

Signed-off-by: alan <547533434@qq.com>
 2015-05-11 16:25:17 +08:00
alan 25bcc676b9 增加附件功能以及修改路由跳转 
Signed-off-by: alan <547533434@qq.com>
 2015-05-11 16:23:15 +08:00
sw 6a31a99c93 编辑课程讨论区回复时的问题 2015-05-08 16:14:46 +08:00
sw 25e80cefb8 Merge branch 'szzh' into guange_dev 2015-05-08 15:44:47 +08:00
sw d4f73ae472 111 2015-05-08 15:43:55 +08:00
sw 5f6f7b7cdf 引用功能图片显示不正常 2015-05-08 15:31:13 +08:00
sw ee051f6a37 1、课程讨论区回复取消功能 
2、课程讨论区回复时不现实主题
 2015-05-08 14:55:56 +08:00
guange 5c4ad1ce7d merge 2015-05-08 14:31:23 +08:00
guange eed39ef0ef 上传头像会进行压缩 2015-05-08 14:28:17 +08:00
alanlong9278 f9a25373b0 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-08 09:55:33 +08:00
alanlong9278 f638dd6810 课程讨论区 
Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 09:55:19 +08:00
sw 78f30344b9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-08 09:55:00 +08:00
sw db6218a487 教师列表界面增加角色显示、教师显示真实姓名 2015-05-08 09:54:40 +08:00
alanlong9278 3d74734607 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-05-08 09:48:43 +08:00
alanlong9278 336b59f606 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	.gitignore
	Gemfile
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/tags/_tag_name.html.erb

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-05-08 09:15:50 +08:00
alan 3b58810528 修改课程讨论区的js 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 17:38:08 +08:00
alan 4bf08e49da Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-07 16:10:22 +08:00
alan 08f1c39033 修改课程讨论区界面 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 16:10:07 +08:00
sw 5ea295f8b5 1、第一次进入作品列表界面 返回顶部按钮不显示 
2、第一次点击返回顶部按钮无用
 2015-05-07 15:58:41 +08:00
sw 628ffc67dd 课程作品列表界面增加返回顶部功能 2015-05-07 10:43:23 +08:00
alan 4546095ed4 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-07 09:53:50 +08:00
alan eee0df8d22 修改课程，项目的讨论区界面 
Signed-off-by: alan <547533434@qq.com>
 2015-05-07 09:53:34 +08:00
sw cba473269d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-07 09:31:22 +08:00
guange 3f88a67eef 编辑器支持直接粘贴QQ截屏 2015-05-06 23:32:34 +08:00
whimlex 3b5d8f76a4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-06 17:41:36 +08:00
whimlex 3c72af69ea 版本库刷新页面时“git操作指南”展开收起保持一致 2015-05-06 17:41:18 +08:00
sw b456bc0e62 评分支持打0分 2015-05-06 16:55:59 +08:00
huang fd28310e15 修改issue列表太长换行问题 2015-05-06 16:37:18 +08:00
sw 6bbf8c8f45 课程通知、课程留言取消按钮删除编辑器内内容 2015-05-06 14:53:25 +08:00
guange bd54edd770 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-05-06 11:05:09 +08:00
guange 05428213a2 让session保持，防止长时间编辑时session丢失 2015-05-06 11:04:57 +08:00
sw 2e26e27298 版本库收起后之保存在cookie中，刷新页面后仍保持收起状态 2015-05-05 17:08:46 +08:00
whimlex 9707a88790 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/project.css
 2015-04-30 17:26:10 +08:00
whimlex 88bbd70102 项目名称导航；问题跟踪页面项目导航到问题列表页面；IE问题跟踪页面缩略图显示 2015-04-30 17:24:30 +08:00
huang 431c6888a7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	public/stylesheets/project.css
 2015-04-30 11:16:09 +08:00
huang 78c410b1ec 解决缺陷中多余的对勾图标 2015-04-30 11:10:41 +08:00
sw 0a8f3faf6a 1、project.css错误代码 
2、项目上传资源弹框
 2015-04-30 09:02:33 +08:00
whimlex 33fc193e65 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-29 17:50:51 +08:00
whimlex bbe4c15293 问题跟踪图片附件和定义的样式不一时，调整图片缩略图显示方式 2015-04-29 17:50:35 +08:00
huang 135c3d9b19 课程讨论区代码重构 
解决路由匹配和JS显示冲突
 2015-04-29 14:29:03 +08:00
sw a6a144d079 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-28 14:37:45 +08:00
sw 4c3013f1ac 修改作业评价上传附件功能500 
作业标题换行
 2015-04-28 14:37:25 +08:00
lizanle edd4bbbe96 Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-28 14:10:04 +08:00
lizanle 404b3e3275 暂时去掉一些editor功能 2015-04-28 14:09:58 +08:00
sw 2d7e4278ad Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-28 13:35:36 +08:00
sw 9b15cbd6ee 1、老师评分、学生匿评增加附件上传，可上传批改后的作业 
2、修改作业列表作业数不显示
 2015-04-28 12:21:35 +08:00
lizanle df7b33fe48 Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-28 10:51:28 +08:00
lizanle fb043f2451 暂时去掉有问题的功能 2015-04-28 10:51:17 +08:00
lizanle de640a59b6 没有push上传成功，打个空格继续push 2015-04-28 09:38:46 +08:00
lizanle 2aac345645 去掉重复的图片上传 2015-04-28 09:37:31 +08:00
lizanle 3fac34d942 删掉没有被修改的图片 2015-04-28 09:16:54 +08:00
sw 456dcf9d40 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 17:52:34 +08:00
sw a64b3940dd 1、当教师评论为空时，预留一部分 2015-04-27 17:50:03 +08:00
lizanle d07a1b945f kindeditor增加切换到简单功能按钮 2015-04-27 17:38:32 +08:00
lizanle 92b79b40da Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-27 17:38:21 +08:00
lizanle e5e0a5857a kindeditor增加切换到简单功能按钮 2015-04-27 17:38:05 +08:00
whimlex 4982c9f7d2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-27 17:15:38 +08:00
whimlex f3fb0115e4 版本库git操作文档默认展开，样式调整 2015-04-27 17:15:21 +08:00
lizanle 99ae746bff Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-27 17:02:06 +08:00
lizanle 8b6369a84f kindeditor增加更多功能按钮 2015-04-27 17:01:52 +08:00
whimlex 40fdda0ee2 版本库git帮助文档的显示与隐藏 2015-04-27 16:58:16 +08:00
sw 03044d0190 课程--资源库：加粗上传课件分类字样 2015-04-27 15:59:22 +08:00
lizanle aff7a97c4b Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-24 16:05:40 +08:00
lizanle 338a7d3ded 暂时去掉code icon 2015-04-24 16:05:32 +08:00
whimlex 481f7ee4ba 意见反馈按回退键重新计算 2015-04-24 15:08:09 +08:00
whimlex 091c6125d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 15:02:53 +08:00
whimlex 85e1262769 意见反馈 2015-04-24 15:02:32 +08:00
sw 91e37c7ab8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-24 14:58:51 +08:00
whimlex 650ffd4397 课程和项目意见反馈 2015-04-24 14:47:50 +08:00
lizanle 138fff1bf5 暂时去掉全屏icon 2015-04-24 12:05:23 +08:00
lizanle c384384b35 改变图标icon位置 2015-04-24 12:02:35 +08:00
lizanle 3810561fb1 改变图标icon 2015-04-24 12:02:09 +08:00
sw f67bdae22a 课程讨论去引用、回帖不换行 2015-04-24 09:10:15 +08:00
lizanle 3e27acf03c Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-24 09:07:36 +08:00
lizanle f4b6b795e3 kindeditor增加代码编辑功能 2015-04-24 09:07:12 +08:00
whimlex 1f83950b50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 18:18:50 +08:00
whimlex b61d76d94e 意见反馈 2015-04-23 18:18:07 +08:00
lizanle cf9cc0af82 Merge remote-tracking branch 'origin/szzh' into szzh 2015-04-23 18:08:10 +08:00
lizanle 681f7b75d6 kindeditor图片上传改为一次弹框 2015-04-23 18:07:51 +08:00
whimlex e61822d74a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 17:56:11 +08:00
whimlex b3e0490b90 意见反馈 2015-04-23 17:55:48 +08:00
sw e21dfe28fd Merge branch 'szzh' into guange_dev 2015-04-23 17:45:22 +08:00
lizanle f7dd4924c1 Merge remote-tracking branch 'origin/szzh' into szzh 
Conflicts:
	public/assets/kindeditor/kindeditor.js
 2015-04-23 17:44:42 +08:00
lizanle 3b99c97617 kindeditor图片上传改为一次弹框 2015-04-23 17:43:34 +08:00
guange 5c0d0230fc 去掉首页底部留白和不对齐 2015-04-23 17:43:10 +08:00
whimlex b5781ac22b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 16:13:19 +08:00
whimlex 5d0d9de6e8 意见反馈各主页内保持一致 2015-04-23 16:13:01 +08:00
huang 4da77d8a71 wiki页面显示 2015-04-23 16:02:18 +08:00
huang c9bfe00a4f 修改成员列表的排列 
版本库页面色系
 2015-04-23 15:31:14 +08:00
sw cfe0635804 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 14:31:01 +08:00
huang de23c3c2a8 配置中子页面调整 
隔行换色显示
显示页面左对齐
 2015-04-23 14:04:22 +08:00
sw 5b5423b8c5 修改贴吧新建帖子、回复显示样式的问题 2015-04-23 10:47:54 +08:00
huang ee1c53bacc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 10:20:15 +08:00
whimlex 2070d69d44 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-23 10:20:01 +08:00
huang 348eae5c45 修改项目模式提示样式 
版本库
版本
 2015-04-23 10:19:59 +08:00
whimlex 19fe973b5b 上传头像 2015-04-23 10:19:43 +08:00
whimlex d66af82478 新建竞赛页面日历插件显示错误 2015-04-23 01:00:17 +08:00
sw 9a07989917 调整header的login的样式 2015-04-22 17:01:36 +08:00
sw 427f26b058 header的login显示 2015-04-22 16:37:24 +08:00
whimlex 36f2643ad8 上传logo 2015-04-22 16:33:12 +08:00
whimlex 86bd708c5d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-22 14:35:25 +08:00
whimlex 21f08830df 意见反馈功能修改 2015-04-22 14:35:04 +08:00
sw 2f2d4257c2 调整提交作业按钮样式 2015-04-22 14:10:45 +08:00
sw d279881daf Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/courses/settings.html.erb
 2015-04-22 11:14:12 +08:00
sw 7b3edb59b0 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	public/javascripts/course.js
 2015-04-22 11:11:51 +08:00
sw 3d8ec17bb1 修改学生作业得分列表弹出框样式 2015-04-22 11:07:39 +08:00
whimlex 0f037e78fa Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	public/stylesheets/public.css
 2015-04-22 10:18:49 +08:00
whimlex 5123ca1047 版本库样式调整 2015-04-22 10:16:14 +08:00
huang ca26b0d819 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/members/create.js.erb
	app/views/members/destroy.js.erb
	app/views/members/update.js.erb
	app/views/users/show.html.erb
	public/javascripts/course.js
 2015-04-22 09:31:13 +08:00
huang 8b77079f44 公开。私有标识强制不换行 2015-04-22 00:55:40 +08:00
sw 57193b077e 作品列表取消分页显示 2015-04-21 20:44:27 +08:00
whimlex b99f8d8056 上传头像，上传课程项目logo提示 2015-04-21 17:56:01 +08:00
huang 5bfef259de 去掉缺陷列表空白处的链接 2015-04-21 15:22:27 +08:00
huang dd25cdc065 1、修改项目三种类型术语 
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
 2015-04-21 14:19:50 +08:00
huang 692500af2e Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-20 14:54:27 +08:00
huang 93e3247685 项目名称不能为空提示 2015-04-20 14:54:04 +08:00
alanlong9278 0668af4f89 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/views/bids/_bid_homework_show.html.erb

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-04-20 14:54:02 +08:00
whimlex 86ef3e680a 项目简介展开更多信息不超过一定内容不显示 2015-04-20 14:45:46 +08:00
whimlex 05712c4c06 学生作业改为作品 2015-04-17 17:48:25 +08:00
whimlex 11d83a863a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/projects/show.html.erb
 2015-04-17 17:08:21 +08:00
whimlex ab39d54b45 版本库文件列表样式 2015-04-17 17:07:23 +08:00
huang 7340ef793c 修改新建项目的显示样式 2015-04-17 16:26:05 +08:00
whimlex 65e6b41d91 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 16:06:40 +08:00
whimlex 22a4bf9216 查看修订样式 2015-04-17 16:06:24 +08:00
huang 7d87915413 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/views/courses/_course_members.html.erb
	app/views/courses/settings.html.erb
	app/views/homework_attach/_homework.html.erb
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-04-17 15:07:01 +08:00
whimlex 0a97bbba9d 项目问题跟踪图片点击空白处关闭 2015-04-17 14:29:16 +08:00
whimlex dc955c7e2d 编辑问题时，编辑问题状态，开始时间、计划完成时间右侧的时间选择器不见了 2015-04-17 14:14:13 +08:00
sw cdbe95f6ec 修改老师配置界面成员搜索 2015-04-17 11:48:47 +08:00
whimlex 51e0217eb8 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-17 11:15:15 +08:00
whimlex eb1f8acbd3 版本库样式修改 2015-04-17 11:14:55 +08:00
sw 9f862ad7a7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-17 11:11:03 +08:00
huang 640f6a1ca7 邮件发送框距离 
去掉讨论区不必要的*
 2015-04-17 10:58:40 +08:00
whimlex 54e63cf4d9 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 
Conflicts:
	app/views/issues/_history.html.erb
	public/stylesheets/project.css
 2015-04-17 08:48:17 +08:00
huang fbcd9f9a96 wiki页面调整 2015-04-17 08:28:07 +08:00
whimlex 8babe384fd 缺陷历史记录调整 2015-04-16 20:11:33 +08:00
whimlex e9cf61e0f4 缺陷状态根据完成度调整 2015-04-16 17:56:19 +08:00
z9hang 47e6d5c909 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-16 17:28:36 +08:00
z9hang 8a26fd4343 课程配置：成员配置处添加搜素成员功能 2015-04-16 17:28:08 +08:00
sw b040981c22 调整course.css 2015-04-16 17:07:43 +08:00
sw 11a4febecb 调整course.css 2015-04-16 17:01:47 +08:00
sw daef2c455a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-16 16:55:44 +08:00
whimlex 8b89110e41 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-16 16:40:11 +08:00
sw 65bcaef911 修改TAG云样式 2015-04-16 16:39:58 +08:00
whimlex ca1e902a8f #2279 搜索课程进入结果页面，如图，建议将“授课时间”与“课程简介”与上面的“课程名称”等信息对齐 2015-04-16 16:39:52 +08:00
sw 332a9b45fb 修改项目上传资源弹框样式 2015-04-16 16:10:24 +08:00
huang bfc83d1a8c 解决项目图片不能上传 2015-04-16 15:48:13 +08:00
sw 6983764c44 修改课程名称过长时的样式 2015-04-16 15:41:50 +08:00
sw 4202ec4bad 个人主页样式 2015-04-16 15:27:49 +08:00
huang b92767bbb5 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 15:16:54 +08:00
huang b80251a247 链接空白处改成不能点击 
修复项目标题过长，布局变形
 2015-04-16 15:16:15 +08:00
lizanle 10bd7c2855 Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq 2015-04-16 14:59:11 +08:00
lizanle 17f495e77b 项目 版本 和 版本库 标签改动 2015-04-16 14:59:05 +08:00
whimlex 19dd5a9879 项目邀请功能和项目更多功能点击事件 2015-04-16 14:25:02 +08:00
huang 4afd9afd08 解决冲突。修改版本页面 
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

Conflicts:
	public/stylesheets/project.css
 2015-04-16 13:42:45 +08:00
huang 08fb04aff4 修改版本库样式 2015-04-16 13:40:46 +08:00
whimlex 20b17f5503 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 12:15:55 +08:00
whimlex 301e44c695 修改附件上传功能无效 2015-04-16 12:15:36 +08:00
huang dc81db1d8b 处理讨论区、缺陷列表样式显示异常 2015-04-16 11:07:37 +08:00
sw 2db3ab9d13 修改课程时增加密码与课时的验证 2015-04-16 10:56:48 +08:00
sw 94ca6cd2f9 新建课程时增加密码与课时的验证 2015-04-16 10:49:58 +08:00
huang 95c5e6ac83 Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/helpers/application_helper.rb
	app/helpers/files_helper.rb
	app/helpers/members_helper.rb
	app/models/journals_for_message.rb
	app/models/mailer.rb
	app/models/user.rb
	app/views/attachments/_form.html.erb
	app/views/bids/_new_homework_form.html.erb
	app/views/boards/_project_show.html.erb
	app/views/courses/_courses_jours.html.erb
	app/views/courses/feedback.html.erb
	app/views/courses/new_homework.html.erb
	app/views/courses/settings.html.erb
	app/views/issues/_list.html.erb
	app/views/issues/new.html.erb
	app/views/messages/_project_show.html.erb
	app/views/messages/edit.html.erb
	app/views/news/_project_news.html.erb
	app/views/projects/invite_members.html.erb
	app/views/projects/settings/_modules.html.erb
	app/views/projects/show.html.erb
	config/configuration.yml
	config/locales/zh.yml
	db/schema.rb
	public/assets/kindeditor/kindeditor.js
	public/javascripts/course.js
	public/stylesheets/courses.css
	public/stylesheets/public.css
 2015-04-16 10:26:03 +08:00
whimlex 9c07976751 展开和收起更多信息图片样式修改；跟踪者样式修改 2015-04-16 09:54:10 +08:00
sw 9905f91228 修改TAG云的显示样式 2015-04-16 09:46:22 +08:00
huang 61ce44af76 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 05:01:58 +08:00
huang c11fdc7273 版本库调整：未完成 2015-04-16 05:01:09 +08:00
whimlex 1d8dee15f4 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 04:59:18 +08:00
whimlex 04698c3e53 项目描述展开信息和收起信息 2015-04-16 04:53:09 +08:00
whimlex d23ac832ca 项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整 2015-04-16 04:12:26 +08:00
huang fec751608a 完成里程碑界面 2015-04-16 03:54:07 +08:00
huang 8e7b4868ca wiki页面调整 2015-04-16 00:30:23 +08:00
huang 6229acac71 完成wiki新建界面 2015-04-15 21:44:19 +08:00
whimlex d79de0a354 课程日期控件样式冲突 2015-04-15 20:27:09 +08:00
sw 0cc809c3e0 实现课程资源TAG云功能 2015-04-15 19:57:16 +08:00
whimlex 7fa2338ce6 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 16:34:52 +08:00
whimlex ba0535e127 完成新建缺陷页面 2015-04-15 16:34:34 +08:00
sw 898d15aa7a 更新course.css文件 2015-04-15 14:41:48 +08:00
sw e579157604 更新public.css 
课程讨论区文件按钮和editor靠的太近
 2015-04-15 14:29:35 +08:00
huang c607bd5cbf 定义缺陷中样式 2015-04-15 12:50:27 +08:00
alanlong9278 b704555628 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	.gitignore
	Gemfile
	app/controllers/discuss_demos_controller.rb
	app/models/user.rb
	app/views/bids/_bid_homework_show.html.erb
	app/views/issues/index.html.erb
	app/views/layouts/_base_feedback.html.erb
	app/views/poll/publish_poll.js.erb
	app/views/poll/republish_poll.js.erb
	public/javascripts/application.js

Signed-off-by: alanlong9278 <547533434@qq.com>
 2015-04-15 12:36:19 +08:00
alanlong9278 a51ba0c104 Signed-off-by: alanlong9278 <547533434@qq.com> 2015-04-15 12:30:37 +08:00
sw be08a9afbb 修改application.css中错误css 2015-04-15 11:42:23 +08:00
sw 61df6e144d 修复学生作业列表QQ浏览器显示超出边框 2015-04-15 10:06:52 +08:00
huang b7537ad518 修改新闻中测出的bug， 
讨论区中附件显示形式
 2015-04-14 23:58:27 +08:00
whimlex b3b9688072 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-14 19:56:19 +08:00
whimlex cdf1ce1c17 缺陷页面 2015-04-14 19:56:03 +08:00
huang b8058c3e12 用户邀请加入的时候增加拒绝功能 
删除提示星系修改
申请加入模块样式调整
 2015-04-14 19:34:01 +08:00
sw c60515ac50 学生作业增加按学生真实姓名、昵称、学号搜索功能 2015-04-14 19:24:39 +08:00
sw bb9513b313 课程学生作业列表增加搜索的静态页面 2015-04-14 16:36:03 +08:00
sw 8c122a35f7 项目类型切换到其他类型后，再切回开发组，更多按钮不可用 2015-04-14 10:46:31 +08:00
huang 48f096178c 修改配置modoule模块 2015-04-13 21:53:52 +08:00
huang 2b063db0cc 修改版本界面 
未完成部分，隔行换色
 2015-04-13 21:08:26 +08:00
whimlex cf4451e998 pre标签换行；contest主页样式调整 2015-04-13 18:34:44 +08:00
sw 01f56a761f 完成配置---模块 2015-04-11 17:28:18 +08:00
sw fb935f124c 完成修改项目界面 2015-04-11 17:04:48 +08:00
sw b19bfa5c0a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-11 16:18:01 +08:00
sw 7ad3c2d578 修改项目配置js 
增加项目配置相关子界面
 2015-04-11 16:17:36 +08:00
huang 78868b34f0 修改缺陷中四中颜色按钮会折断换行的bug 
区别新闻和通知
 2015-04-11 15:12:06 +08:00
huang 4adfec5640 解决样式冲突 
添加新闻展示页面
 2015-04-11 14:49:26 +08:00
sw b06e9ce468 干掉重复样式 2015-04-11 14:22:50 +08:00
sw 837fe88545 还原冲突，增加项目配置切换js 2015-04-11 14:19:52 +08:00
sw 633a53d1d4 更新css文件 2015-04-11 14:17:51 +08:00
whimlex 7e46885f3d 修改上传附件数目限制 2015-04-11 13:46:49 +08:00
whimlex 5936d8d8e9 评论显示 2015-04-11 11:52:11 +08:00
sw 9ad00e437f 1、修改引用的样式 
2、修改错误图片链接
 2015-04-11 11:51:11 +08:00
huang b8b8a12ca8 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-11 11:50:33 +08:00
huang 8f6b095fdb 新闻页面调整 2015-04-11 11:48:39 +08:00
sw 3313bef0b1 路由报错 2015-04-11 11:00:06 +08:00
whimlex 874dcc2b89 附件上传国际化调整 2015-04-10 17:58:59 +08:00
huang 33abbaffe1 修改isuue显示界面 
附件显示形式
国际化
部分样式调整
 2015-04-10 17:49:16 +08:00
whimlex e148917865 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-10 17:00:10 +08:00
whimlex 69153d2d95 项目界面缺失翻译调整 2015-04-10 16:59:45 +08:00
sw 600003e48c 公共贴吧中使用新编辑器上传大图片，图片超出界面 2015-04-10 15:54:17 +08:00
sw 400d1a147d 课程新编辑器导致图片超出页面 2015-04-10 15:43:37 +08:00
sw ea0bd7e0dd 1、技术支持只有白羽 
2、修改鼠标悬浮在白羽上有下划线
 2015-04-10 15:22:03 +08:00
sw 172e69a552 1、课程导航懒点击课程跳到动态页面 
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
 2015-04-10 15:16:11 +08:00
sw 0c949b7117 1、课程导航懒点击课程跳到动态页面 
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
 2015-04-10 15:16:02 +08:00
sw 596bc213ca 1、课程导航懒点击课程跳到动态页面 
2、右上角课程下拉条增宽
3、课程通知 截至时间-->创建时间
 2015-04-10 15:15:49 +08:00
huang f2cf46f0a0 修改缺陷列表显示bug 2015-04-09 19:38:49 +08:00
huang e907f5e3e4 1.解决缺陷列表图片不显示 
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
 2015-04-09 19:18:04 +08:00
sw 5ad1028c49 Merge branch 'szzh' into guange_dev 2015-04-09 16:05:49 +08:00
sw 6abdc4c7e1 课程成员配置界面，显示学生真实姓名，无真实姓名的蔡先生login 2015-04-09 14:29:35 +08:00
huang 4d4e1cac8b 完成新的邮件邀请界面 2015-04-09 10:25:46 +08:00
huang 45fa01c773 修改缺陷不能显示的bug 2015-04-09 09:22:09 +08:00
guange 0325554d24 Merge remote-tracking branch 'origin/szzh' into guange_dev 2015-04-09 09:20:50 +08:00
huang b415575e0e 修改新缺陷列表 
完成部分项目配置
 2015-04-09 08:43:51 +08:00
sw c5b55042d4 1、修复课程讨论区引用功能 
2、回复时回复框自动获得焦点
3、引用样式
4、修改提交回复时下面出现的提示信息
 2015-04-08 17:25:52 +08:00
sw dae907d0b8 1、课程通知无法添加评论 
2、课程通知界面显示
3、课程通知评论取消按钮
 2015-04-08 15:49:53 +08:00
sw 663c9aad60 1、课程通知列表出现html代码 
2、整理课程通知部分js
3、还原编辑器js代码
 2015-04-08 15:01:41 +08:00
sw 15567e7d7b 1、新的编辑起未对其 
2、老师新建作业增加marting-bottom
 2015-04-08 14:14:44 +08:00
guange 89af4b451b #2100 IE8中，课程--老师发布作业/学生提交作业，上传附件提交不了 2015-04-08 13:52:52 +08:00
huang 069f59805d 修改左侧新建按钮居中 2015-04-08 12:59:24 +08:00
huang 34321d35ec 添加相关图片 
动态箭头
 2015-04-08 12:01:46 +08:00
sw ba4894239c 1、部分浏览器下新建课程页面密码默认填写，课时默认填写为登录名 
2、修改课程密码显示取消明码显示
 2015-04-08 11:29:21 +08:00
huang d832514a55 新增项目成员列表 2015-04-08 11:24:40 +08:00
huang bf36da8dcb 修改醒目新闻新建页面 
退出项目样式
 2015-04-08 09:57:48 +08:00
huang 8b379711d9 1、修改附件列表排列和样式 
2、谈论区样式显示
3、讨论区：“编辑” “引用”， “回复”
4、讨论区与课程分离
 2015-04-07 17:45:00 +08:00
sw 0bea5dbb4e 修改课程动态标题a标签过长 2015-04-07 15:45:39 +08:00
huang c1fea1c7e2 课程资源新界面 
项目动态分页调整
 2015-04-07 14:48:36 +08:00
sw 3bedddd190 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-04-07 13:49:45 +08:00
huang 12eaac5683 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/boards/_project_show.html.erb
	public/javascripts/course.js

处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
 2015-04-07 13:47:39 +08:00
huang df43274565 新版项目界面（部分未完成，先合并） 
1、项目框架整理
2、各页面样式
 2015-04-07 12:48:47 +08:00
whimlex 7b09fd0489 作业的时间选择器选择时间后不能自动关闭 2015-04-03 17:33:33 +08:00
sw b971147aa8 1、添加通知会alert 
2、添加通知描述样式
3、通知添加评论样式
 2015-04-03 15:01:26 +08:00
sw ec8e609ddc 打爆下载增加权限、增加打包下载功能 2015-04-03 13:10:18 +08:00
lizanle ceb6af7365 课程相关模块添加编辑器 2015-04-03 11:19:15 +08:00
sw b344bf3ea6 分页空间样式调整 2015-03-30 18:04:52 +08:00
sw 94ecc3e59e 1、课程新增成员分页控件样式 
2、课程老师列表翻页不可用
 2015-03-30 17:03:20 +08:00
sw ed02959e00 修改成员角色 2015-03-30 15:57:10 +08:00
sw 083a3b9de6 1、课程成员列表显示昵称 
2、添加课程成员功能
 2015-03-30 13:47:19 +08:00
sw 98bf8dd494 课程成员列表显示 2015-03-30 11:20:16 +08:00
sw 046536230c 增加课程配置界面、成员的基本信息以及相关js 2015-03-30 10:47:23 +08:00
guange f139427f03 Merge remote-tracking branch 'origin/szzh' into guange_dev 
Conflicts:
	app/controllers/zipdown_controller.rb
	app/views/bids/_homework_list.html.erb
	config/routes.rb
	db/schema.rb
	public/javascripts/attachments.js
 2015-03-27 18:17:46 +08:00
sw 21db854adb Merge branch 'develop' into szzh 2015-03-27 17:45:08 +08:00
sw fcc4275a36 Merge branch 'sw_new_course' into szzh 2015-03-27 17:44:29 +08:00
huang 582c70a96c 修改项目讨论区未选择置顶/锁定选项时显示异常 2015-03-27 16:25:39 +08:00
z9hang 38b4967eb5 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:23:53 +08:00
sw 07de1f3de1 教师字体颜色不正确 2015-03-27 16:24:11 +08:00
z9hang 35e0f73345 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:23:19 +08:00
z9hang cc2cce22cf 讨论区附件样式修改 2015-03-27 16:23:09 +08:00
sw 61ddfc6363 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 16:13:20 +08:00
sw 6a9abf12b9 1、当问卷描述过长，显示超过页面 
2、描述未对齐
 2015-03-27 16:11:56 +08:00
z9hang 1c53731966 留言框样式调整 2015-03-27 16:02:06 +08:00
sw 1e3b28d4bd 修改上传图片样式 2015-03-27 15:57:47 +08:00
sw 7b70369438 上传文件样式调整 2015-03-27 15:19:13 +08:00
z9hang 41e372c16a 上传资源按钮样式调整 2015-03-27 14:51:59 +08:00
sw ec2e9eaf26 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 14:28:27 +08:00
z9hang e6e1d5342f 图片预览框样式问题 2015-03-27 14:26:25 +08:00
sw 2ca2f90830 上传文件js问题 2015-03-27 14:21:10 +08:00
sw b9031095d4 Merge branch 'szzh' into sw_new_course 
Conflicts:
	Gemfile
	app/controllers/courses_controller.rb
	app/views/attachments/_form.html.erb
	app/views/attachments/_form_course.html.erb
	app/views/files/_attachement_list.html.erb
	app/views/layouts/base.html.erb
	app/views/layouts/base_projects.html.erb
	config/locales/zh.yml
	public/javascripts/attachments.js
 2015-03-27 14:13:49 +08:00
sw c68349803e 1、课程讨论区、通知提示信息样式 
2、整理js
 2015-03-27 13:42:15 +08:00
sw 9629e3be11 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-27 11:32:20 +08:00
sw 65824be778 修改css 2015-03-27 11:32:13 +08:00
z9hang 15f0058374 修正课程资源界面搜索按钮样式 2015-03-27 11:14:49 +08:00
sw 240fc240e6 修改默认图片 
修改上传按钮样式
 2015-03-27 09:51:20 +08:00
sw 8c795edf9e 解决冲突 2015-03-27 09:33:56 +08:00
sw fcbcdffa44 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	public/stylesheets/courses.css
 2015-03-27 09:33:41 +08:00
sw 519c119543 修改上传文件样式 2015-03-27 09:32:13 +08:00
z9hang d8da3bb73c 课程通知列表显示多一个空行问题 2015-03-27 09:05:43 +08:00
sw a99dda837a 课程动态描述过长超出界面 2015-03-26 19:11:06 +08:00
z9hang b8ab3770f1 资源样式冲突调整 2015-03-26 19:10:27 +08:00
sw 9a2f572cf4 是否启用匿评功能异常 2015-03-26 19:06:17 +08:00
z9hang a59677c22e 课程通知展开信息按钮显示隐藏控制 2015-03-26 19:02:40 +08:00
sw cba678a357 课程是否启用匿评 
课程作业列表样式
加入与退出课程按钮样式
 2015-03-26 19:01:22 +08:00
z9hang 2c5c261b70 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-26 17:41:43 +08:00
z9hang e1afdab988 留言样式修改 2015-03-26 17:41:25 +08:00
sw 0d04eb745f Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-26 17:18:27 +08:00
sw cb1fce32fe 配置课程 2015-03-26 17:17:31 +08:00
lizanle d1bc2b85d0 kindeditor。 2015-03-26 16:12:03 +08:00
sw 8f90fed8be 新建课程界面完成 2015-03-26 16:01:25 +08:00
z9hang 57dad3f3c7 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-26 15:55:21 +08:00
z9hang 8ef9779b46 修正课程讨论区样式。修正项目讨论区被影响的样式 2015-03-26 15:55:07 +08:00
lizanle 72eff3a032 Merge remote-tracking branch 'origin/szzh' into szzh 2015-03-26 15:25:51 +08:00
huang 26ed40f7e1 学生作业列表样式调整 2015-03-26 14:31:24 +08:00
sw 090190f3e6 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-26 11:56:13 +08:00
sw c8a08d5a56 1、切换分班功能 
2、非老师用户不能编辑、删除分班
 2015-03-26 11:55:42 +08:00
sw ab7d12e514 1、修改、删除分班是js方法重构 
2、验证分班名是否重复重构
 2015-03-26 11:30:00 +08:00
z9hang 94fd3060ae Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-26 11:02:35 +08:00
z9hang 132287d6e1 课程通知界面完善 2015-03-26 11:02:18 +08:00
huang dac4ffe66e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-26 10:42:15 +08:00
huang eac6f814a8 解决浏览器提示关闭按钮与邮件邀请界面冲突 2015-03-26 10:41:54 +08:00
sw ab3a3a8573 学生收索功能 2015-03-25 20:38:07 +08:00
z9hang 30cb622abd 评论显示页面修改 2015-03-25 20:36:49 +08:00
whimlex 05d17361e9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/views/projects/invite_members_by_mail.html.erb
 2015-03-25 17:30:54 +08:00
whimlex 1452e09154 邮件邀请邮箱格式自动填充；部分国际化 2015-03-25 17:28:22 +08:00
sw e465d66689 上传资源样式没了。。 2015-03-25 16:34:26 +08:00
sw 746a7902c5 更新css文件 2015-03-25 16:29:30 +08:00
sw 07623a1e02 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-25 14:35:39 +08:00
sw 7b379456ed 课程作业描述很长时才显示更多按钮 2015-03-25 14:34:20 +08:00
z9hang 09991b9cf7 课程资源模块弹框样式调整 2015-03-25 14:26:33 +08:00
sw 6c5cf50bf0 去掉弹框js 2015-03-25 14:12:57 +08:00
sw 27e7bc21b5 当课程简介内容很少时（点击显示更多没有反应），取消显示更多按钮的显示 2015-03-25 14:09:44 +08:00
guange 4b636d8be6 #1801 打包上传分个数下载完成 2015-03-25 13:13:09 +08:00
sw 36d168f773 调整提交问卷时弹出框样式 2015-03-25 11:06:35 +08:00
guange bdf419438e merge 2015-03-25 10:38:04 +08:00
sw 61d7d65b55 Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	app/views/courses/_courses_jours.html.erb
 2015-03-25 10:28:50 +08:00
sw bcf9d5919c 1、处理部分a标签调用js函数时会刷新页面的BUG 
2、修改弹出框样式，制作弹出框demo
 2015-03-25 10:21:33 +08:00
huang 525a6394ca 1、公共贴吧邮件提醒 
2、浏览器版本过低提醒（样式需要再调试）
 2015-03-25 10:20:08 +08:00
z9hang 8190d0cecc 修改留言页面样式 2015-03-24 19:51:03 +08:00
z9hang be46142b3c Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 
Conflicts:
	public/javascripts/course.js
 2015-03-24 17:14:08 +08:00
z9hang 19eaa012b7 讨论区样式调整 2015-03-24 17:12:51 +08:00
sw 2ef10e89ac Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-24 17:01:19 +08:00
sw 273e82f620 修改poll的show界面的样式 2015-03-24 16:26:54 +08:00
sw 25b3772520 增加poll统计结果的显示 2015-03-24 16:14:04 +08:00
sw 1bba235ca0 1、更新poll.css文件 
2、修改poll的index界面
 2015-03-24 15:46:23 +08:00
sw 7970bd6df0 1、增加作业截至时间的js显示 
2、截止时间到了之后的显示
 2015-03-24 09:57:55 +08:00
z9hang a2ec9c661a Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course 2015-03-24 08:43:54 +08:00
z9hang 64d208555e 样式调整 2015-03-24 08:43:40 +08:00
sw 584dcabeaa 修改学生作业列表弹出框不正确 2015-03-23 20:36:52 +08:00
sw 37bd338311 1、老师修改作业增加默认值显示 
2、学生提交作业列表修改layout
 2015-03-23 19:55:29 +08:00
sw f3fefe50f1 1、增加flash显示样式 
2、修改老师创建作业完成的js
3、修改老师创建作业界面样式
 2015-03-23 18:40:58 +08:00