Commit Graph

45 Commits

Author SHA1 Message Date
huang faf1fcaf22 issue回复局部刷新
附件浏览问题
昵称改成登录名
2016-01-22 17:27:21 +08:00
lizanle 47a9be132a 详情和编辑页面 2015-12-16 09:31:11 +08:00
lizanle d13205bd3d 文件正在上传提示 2015-11-11 11:39:02 +08:00
yutao 3b2db627c4 ... 2015-06-15 13:42:09 +08:00
yutao b6f3233318 bug#2304:新版项目--wiki:如图,建议修改上传附件显示样式 2015-06-15 12:12:12 +08:00
sw 33365f7ea6 修改编辑作业时附件显示移位 2015-05-14 16:04:07 +08:00
sw 261ebb916c 1、当login过长,用户匿评界面的星星换行
2、去掉无用的创建作业的代码,与弹出框创建作业代码冲突
2015-04-27 20:25:28 +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
whimlex cdf1ce1c17 缺陷页面 2015-04-14 19:56:03 +08:00
guange 89af4b451b #2100 IE8中,课程--老师发布作业/学生提交作业,上传附件提交不了 2015-04-08 13:52:52 +08:00
whimlex d73d842e31 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-20 15:59:53 +08:00
whimlex 34579e395f 附件上传bug修改;意见反馈收拉一致 2015-03-20 15:59:30 +08:00
z9hang eebcccd4bb 编辑贴吧等不显示附件问题 2015-03-20 15:20:11 +08:00
whimlex 93838f604d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-03-20 11:35:18 +08:00
whimlex 3837e1fcf5 申请加入:附件上传 2015-03-20 11:34:59 +08:00
guange 92b72c995a 纠正合并 2015-03-19 17:47:51 +08:00
guange e007920cb6 Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
	Gemfile
	app/views/attachments/_form.html.erb
2015-03-19 17:41:45 +08:00
whimlex b95852dfcd 附件上传国际化:修改页面一些bug:用户主页个人得分身份信息修改 2015-03-19 17:21:11 +08:00
z9hang 274295c948 #2033 项目--更多--新闻:编辑新闻相关问题 2015-03-17 14:55:21 +08:00
guange 366fbcd4d4 #2105 fixed ie8下新建帖子时上传附件导致不能发表问题 2015-03-14 12:29:09 +08:00
guange e5e46819b4 #867 新建缺陷:校验失败也要保存上传文件信息 2015-03-10 22:35:36 +08:00
lizanle 7ee58d1d44 项目动态重写,并去掉首页缓存 2015-03-04 15:32:00 +08:00
sw bde5cb9302 1.修改作业界面修改
2.作业附件取消加粗显示
3.作业创建、修改建业页面高度为自动
4.删除作业成员增加相关提示
2014-11-03 15:35:29 +08:00
z9hang 0d6116d216 公共贴吧编辑附件时公开与否属性的显示错误 2014-10-11 14:47:48 +08:00
sw 1361801723 上传文件描述最长限定254个字符 2014-10-09 11:16:45 +08:00
z9hang 6a41ccbc7c #1325 发布的作业添加删除附件功能,编辑时附件的是否公开加上“公开”2字 2014-10-08 12:00:38 +08:00
alan 8c19ec8aa0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/helpers/projects_helper.rb
	app/views/contest_notification/show.html.erb

Signed-off-by: alan <547533434@qq.com>
2014-09-15 10:58:14 +08:00
z9hang 8596d594a7 js失去焦点事件与点击事件冲突问题,使用onmouseover事件获取焦点隔开两事件 2014-09-02 09:57:59 +08:00
z9hang 4711e638eb 复制有附件的缺陷报错问题(屏蔽掉复制附件的功能) 2014-08-28 15:40:34 +08:00
chenmin f3807461d9 修复课程新建帖子的bug 2014-08-22 11:53:49 +08:00
chenmin 9da85bb5a3 修复回复和编辑项目帖子时都显示帖子附件的bug; 2014-08-22 10:40:43 +08:00
sw 9688a73aa1 1.新建竞赛作品增加js验证
2.修复上传图片一次超过2张,上传失败的BUG
2014-08-16 13:30:38 +08:00
linhk 0c00754057 解决谷歌浏览器再上传相同文件时不可用 2014-08-07 09:13:01 +08:00
nwb 095cb7fc32 加强对chrome浏览器文件上传的支持 2014-07-22 15:02:58 +08:00
nwb 6688ba61dd 1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
2014-07-11 09:07:09 +08:00
yanxd 5364687160 bootstrap & tag bug 2014-05-23 17:07:58 +08:00
nwb 5ca9d96acd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-05-17 14:39:00 +08:00
nwb 7df6be8ff4 调整资源文件界面 2014-05-17 14:07:57 +08:00
z9hang 5d15349482 编辑作业时显示已添加的附件 2014-05-16 17:45:20 +08:00
kg d450da9df8 footer , footer of base_course,upload files count and delete all upload 2014-04-17 08:33:44 +08:00
zhangyang 06a859eb5e 修正上传文件显示 2013-08-06 16:08:54 +08:00
huangjingquan 70b211e355 first commit 2013-08-01 10:33:49 +08:00