Commit Graph

154 Commits

Author SHA1 Message Date
yutao 3b2db627c4 ... 2015-06-15 13:42:09 +08:00
yutao b6f3233318 bug#2304:新版项目--wiki:如图,建议修改上传附件显示样式 2015-06-15 12:12:12 +08:00
huang 2acab1719e 修改附件上传上面被截取问题 2015-06-12 17:50:05 +08:00
sw 94e8bd13ab 资源作者 2015-06-10 16:24:11 +08:00
sw f168e43b0f 1、返还批阅的附件可以删除并且js刷新
2、学生可以在作品show界面删除自己的作业的附件
2015-06-04 09:57:30 +08:00
sw cc5171bc1d 解决冲突 2015-06-02 14:48:48 +08:00
sw 1ae8c7d234 作业评分、上传评阅结果,以及上传结果的显示样式 2015-05-26 17:51:56 +08:00
yutao a35abf1f1f 修复bug#2180:课程资源库:成功引入资源后,“选人我的课程”未自动刷新为“选入我的其他课程” 2015-05-20 11:56:34 +08:00
yutao f3da7979f8 修复bug#2476 : 项目--问题跟踪:关于上传附件的描述的显示问题 2015-05-19 12:22:53 +08:00
sw b84f6280c2 wiki报500 2015-05-15 17:29:25 +08:00
yutao 68cf5fa55e 修复:当1个页面存在多个上传控件时的各种bug 2015-05-15 11:45:15 +08:00
alan cc5738c12f 课程讨论区回复样式错误
Signed-off-by: alan <547533434@qq.com>
2015-05-15 10:07:52 +08:00
alan e9c1012cbe 修改附件上传时公开,删除位置不一致
Signed-off-by: alan <547533434@qq.com>
2015-05-14 17:23:55 +08:00
alan b8651606be Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-05-14 17:11:43 +08:00
alan 0db90f98d5 wiki的attachment与讨论区冲突
Signed-off-by: alan <547533434@qq.com>
2015-05-14 17:09:38 +08:00
alan e3d277163f 修改个人主页的链接
Signed-off-by: alan <547533434@qq.com>
2015-05-14 16:59:43 +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 33365f7ea6 修改编辑作业时附件显示移位 2015-05-14 16:04:07 +08:00
sw 963a21283f 1、修改作业打分插件星星移位
2、修改返还批改结果显示不正确
2015-05-14 15:09:15 +08:00
huang 84efdb16c9 解决wiki500错误
show_new代码优化(代码中存在错误)
2015-05-14 11:06:26 +08:00
alan fe2f6a0d9d 修改样式以及添加回复取消功能
Signed-off-by: alan <547533434@qq.com>
2015-05-13 14:31:54 +08:00
alan fe92b05026 讨论区编辑添加附件
Signed-off-by: alan <547533434@qq.com>
2015-05-12 17:14:07 +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
whimlex 88bbd70102 项目名称导航;问题跟踪页面项目导航到问题列表页面;IE问题跟踪页面缩略图显示 2015-04-30 17:24:30 +08:00
whimlex 538ba33174 问题跟踪附件图片显示不拉伸 2015-04-30 10:47:34 +08:00
whimlex bbe4c15293 问题跟踪图片附件和定义的样式不一时,调整图片缩略图显示方式 2015-04-29 17:50:35 +08:00
sw 90c143f047 评论上传附件换行 2015-04-28 15:02:10 +08:00
sw 9b15cbd6ee 1、老师评分、学生匿评增加附件上传,可上传批改后的作业
2、修改作业列表作业数不显示
2015-04-28 12:21:35 +08:00
sw 261ebb916c 1、当login过长,用户匿评界面的星星换行
2、去掉无用的创建作业的代码,与弹出框创建作业代码冲突
2015-04-27 20:25:28 +08:00
huang 681546b860 缺陷上传附件显示
项目邮件邀(未完成,需切换分支)
2015-04-22 16:49:07 +08:00
whimlex dc955c7e2d 编辑问题时,编辑问题状态,开始时间、计划完成时间右侧的时间选择器不见了 2015-04-17 14:14:13 +08:00
huang 54b81bdfb3 项目类型图标 2015-04-17 10:13:47 +08:00
huang fbcd9f9a96 wiki页面调整 2015-04-17 08:28:07 +08:00
huang 0ea683e1b4 修改issue中图片附件的缩略图显示方式 2015-04-17 07:45:37 +08:00
whimlex 301e44c695 修改附件上传功能无效 2015-04-16 12:15:36 +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 d23ac832ca 项目页面搜索按钮功能实现;问题跟踪页面编辑按钮功能实现;问题跟踪页面样式调整 2015-04-16 04:12:26 +08:00
whimlex ba0535e127 完成新建缺陷页面 2015-04-15 16:34:34 +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
whimlex cdf1ce1c17 缺陷页面 2015-04-14 19:56:03 +08:00
whimlex 874dcc2b89 附件上传国际化调整 2015-04-10 17:58:59 +08:00
huang 33abbaffe1 修改isuue显示界面
附件显示形式
国际化
部分样式调整
2015-04-10 17:49:16 +08:00
guange 89af4b451b #2100 IE8中,课程--老师发布作业/学生提交作业,上传附件提交不了 2015-04-08 13:52:52 +08:00
huang 8b379711d9 1、修改附件列表排列和样式
2、谈论区样式显示
3、讨论区:“编辑” “引用”, “回复”
4、讨论区与课程分离
2015-04-07 17:45:00 +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
z9hang 5eac727584 项目资源模块功能完成(样式尚未调整,代码尚未应用) 2015-03-31 15:57:15 +08:00
sw fcc4275a36 Merge branch 'sw_new_course' into szzh 2015-03-27 17:44:29 +08:00
whimlex 54908423bc 课程--作业附件显示问题;问题跟踪附件显示问题 2015-03-27 17:00:23 +08:00