Commit Graph

61 Commits

Author SHA1 Message Date
huang 44c097dbaf 1、issue回复添加新的编辑器
2、解决issue回复含有html问题
3、解决项目动态中含有html问题
2015-09-25 11:45:57 +08:00
huang b66de0ee9f issue相关问题 2015-09-24 17:03:43 +08:00
huang 25a604d7b8 issue解决冲突 2015-09-24 16:59:19 +08:00
huang 99473c6880 Merge branch 'szzh' into dev_hjq
Conflicts:
	app/views/issues/show.html.erb
2015-09-24 11:46:33 +08:00
huang 5b671c5109 issue 引用模式修改
issue相关代码优化
2015-09-23 14:27:47 +08:00
huang 8d64114c58 留言引用样式调整 2015-09-22 17:31:33 +08:00
cxt a37f39558d 项目和课程的列表符号样式修改 2015-09-22 15:54:50 +08:00
ouyangxuhua d1418f1bbe 主题--id 2015-08-01 17:45:40 +08:00
ouyangxuhua 188c056e95 问题跟踪的问题,改为问题的id 2015-08-01 17:42:58 +08:00
huang 6890160375 issue列表、issue显示页面鼠标经过的时候显示issue类型 2015-07-15 10:26:51 +08:00
huang c246405e96 issue显示页面添加优先级 2015-07-07 16:25:59 +08:00
huang af59cd9ba7 1、项目issue区分主贴和回帖
2、引用模式修改
2015-07-02 08:43:41 +08:00
guange d793a8119a 修改粘图的加载方式 2015-06-17 17:01:03 +08:00
sw bcb1b8dc39 Merge branch 'guange_dev' into szzh 2015-05-28 08:47:14 +08:00
huang f770702d0b issue编辑时候去掉铅笔图标 2015-05-27 11:08:05 +08:00
huang 6bb649e831 issue引用在项目动态的显示格式调整 2015-05-27 08:36:32 +08:00
huang a6da2b4a01 项目添加新的编辑器
显示页面显示样式调整
2015-05-26 16:30:06 +08:00
huang 975b19c5de 修改缺陷“添加于”“更新于”逻辑 2015-05-22 10:35:27 +08:00
huang fa563b60d5 项目issue添加周报功能 2015-05-20 11:12:25 +08:00
huang 2fb5871058 缺陷显示新界面 2015-05-15 11:26:50 +08:00
whimlex 88bbd70102 项目名称导航;问题跟踪页面项目导航到问题列表页面;IE问题跟踪页面缩略图显示 2015-04-30 17:24:30 +08:00
huang dd25cdc065 1、修改项目三种类型术语
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
2015-04-21 14:19:50 +08:00
huang 0ea683e1b4 修改issue中图片附件的缩略图显示方式 2015-04-17 07:45:37 +08:00
huang 611952eb05 新建项目时候设定默认项目类型
新建项目样式异常调整
2015-04-16 16:36:34 +08:00
huang 890f36a2d5 优化缺陷 2015-04-16 14:13:12 +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 9c07976751 展开和收起更多信息图片样式修改;跟踪者样式修改 2015-04-16 09:54:10 +08:00
whimlex 596e89a14f 缺陷更新页面 2015-04-15 20:05:21 +08:00
huang 104075b3fd 修改缺陷留言方式 2015-04-15 16:38:39 +08:00
huang 0023d0610b 缺陷主题、描述强制换行
跟踪按钮样式
引用样式修改
2015-04-15 15:15:51 +08:00
huang c607bd5cbf 定义缺陷中样式 2015-04-15 12:50:27 +08:00
huang bfe0176b74 修改附件显示样式 2015-04-15 11:15:25 +08:00
whimlex 7e46885f3d 修改上传附件数目限制 2015-04-11 13:46:49 +08:00
huang 33abbaffe1 修改isuue显示界面
附件显示形式
国际化
部分样式调整
2015-04-10 17:49:16 +08:00
huang 287c767c86 缺陷页面样式调整 2015-04-09 20:47:09 +08:00
dingxu 440855c0e6 修改项目tag样式 2015-03-19 16:25:18 +08:00
z9hang fd2c3e8201 修改课程动态接口 2015-03-18 17:21:19 +08:00
huang b3cbfd39ca 修改一些缺陷,删掉多余的文件 2015-03-07 01:07:50 +08:00
huang c159bb2c48 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/controllers/projects_controller.rb
	app/views/issues/show.html.erb
	app/views/layouts/base_projects.html.erb
	app/views/projects/_form.html.erb
	app/views/projects/new.html.erb
	app/views/projects/show.html.erb
2015-03-06 15:23:42 +08:00
huang beac15475d 新项目及用户反馈框的修改!! 2015-03-06 14:55:21 +08:00
lizanle 7ee58d1d44 项目动态重写,并去掉首页缓存 2015-03-04 15:32:00 +08:00
sw df0c1e5917 修复缺陷标题超出界面的问题 2014-08-13 17:37:00 +08:00
sw 339b5b0296 缺陷编辑页面直接显示,不需要点击留言按钮才显示缺陷编辑页面 2014-06-20 17:14:43 +08:00
z9hang eae3918074 添加用户得数统计功能
帖子内的踩顶横排
2014-06-13 16:09:43 +08:00
z9hang 97ae2356bf 引用被遮住不能点问题 2014-05-28 20:09:49 +08:00
yanxd 05baffe4f3 issue导航,首页贴吧动态html,加入了最后回复 2014-05-06 17:04:24 +08:00
yanxd ad23ba646e 理理css 2014-03-28 18:12:46 +08:00
yanxd 163cdc8cf7 issues to_param 2014-03-24 16:46:24 +08:00
yanxd 2e3b44c830 id-name(position|count) 2014-03-24 11:11:13 +08:00