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

285 Commits

Author SHA1 Message Date
lizanle 0cd96f579e 批量修改tag 2015-10-08 11:34:12 +08:00
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
huang 48b93f2113 项目缺陷消息点对点发送 
回复逻辑优化（未完成）
 2015-09-21 17:51:00 +08:00
cxt 098be99b84 动态回复框的样式调整 2015-09-19 11:18:41 +08:00
cxt cacb3e043a 动态回复框的焦点前焦点后样式调整 2015-09-18 16:34:37 +08:00
cxt 8f317711b8 动态回复框高度的自适应 2015-09-17 19:06:15 +08:00
cxt 036129a622 动态回复后的回复框样式不改变 2015-09-17 10:02:28 +08:00
sw 00a8dc94c3 缺陷的回复功能 2015-09-01 15:17:40 +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 ac0e774bcb issue留言内容冲突 2015-07-08 16:35:25 +08:00
huang c246405e96 issue显示页面添加优先级 2015-07-07 16:25:59 +08:00
huang 7ebdf4a08d issue列表增加优先级 
修改issue列表界面
 2015-07-07 11:29:40 +08:00
huang 08123c2d62 缺陷回帖缩进 2015-07-03 16:11:11 +08:00
huang e986ee4e4e Merge branch 'szzh' into dev_hjq 
Conflicts:
	app/views/issues/_edit.html.erb
 2015-07-03 10:51:54 +08:00
huang f3e71450ee 修改issue列表在IE浏览器下显示异常 2015-07-02 17:20:09 +08:00
huang f9cecbee5c 缺陷显示中回复和留言修改 2015-07-02 09:20:27 +08:00
huang af59cd9ba7 1、项目issue区分主贴和回帖 
2、引用模式修改
 2015-07-02 08:43:41 +08:00
huang dd33210d05 区分缺陷回复合主贴 2015-06-30 10:35:20 +08:00
guange d793a8119a 修改粘图的加载方式 2015-06-17 17:01:03 +08:00
huang df5c040aab 添加项目issue复制功能 2015-05-27 16:00:11 +08:00
huang 95f3d89afa 项目新闻添加编辑器：显示页面、列表页面新样式显示 2015-05-27 14:45:36 +08:00
huang 1e8ef39369 Merge branch 'guange_dev' into szzh 2015-05-27 11:15:30 +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 b89ff45fc2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-26 16:30:28 +08:00
huang a6da2b4a01 项目添加新的编辑器 
显示页面显示样式调整
 2015-05-26 16:30:06 +08:00
yutao fa26f649f2 ... 2015-05-23 16:49:54 +08:00
yutao 8781eb3238 ... 2015-05-23 16:26:15 +08:00
yutao c4c2da48db 修复bug#2485:项目--问题跟踪相关建议 2015-05-23 11:55:26 +08:00
huang ceafa459fd issues编辑时跳转问题 2015-05-23 11:26:36 +08:00
yutao a6e15f5609 ... 2015-05-22 11:27:47 +08:00
huang eb539073ec Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-05-22 10:35:52 +08:00
huang 975b19c5de 修改缺陷“添加于”“更新于”逻辑 2015-05-22 10:35:27 +08:00
yutao 30bc053f47 ... 2015-05-21 16:56:08 +08:00
yutao bfb0a43de1 修复bug#2485:项目--问题跟踪相关建议 2015-05-21 16:35:50 +08:00
huang 19d911cf95 缺陷列表搜索栏中添加“我” 2015-05-20 14:40:51 +08:00
huang fa563b60d5 项目issue添加周报功能 2015-05-20 11:12:25 +08:00
huang c711e29cd5 1、项目成员可以查看项目私有issue。 
2、区分不可见和可见issue的数目统计。
 2015-05-20 09:35:42 +08:00
yutao 5184f9a31a 修复bug#2622:项目--问题跟踪：点击问题列表分页中某页，总是返回该页面的最下端 2015-05-19 13:06:02 +08:00
yutao a4cf7bcaad 修改问题跟踪列表翻页为局部刷新 2015-05-15 12:17:47 +08:00
huang 2fb5871058 缺陷显示新界面 2015-05-15 11:26:50 +08:00
sw 559b5ce7ab 打开缺陷在新的页面打开 2015-05-08 10:02:14 +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
lizanle 1cb3dfc833 项目issue翻页后查询条件丢失修改 2015-05-07 09:20:11 +08:00
lizanle 6c7b92558c 项目issue翻页后查询条件丢失修改 2015-05-07 09:08:29 +08:00
lizanle 700d2985f6 项目issue翻页后查询条件丢失修改 2015-05-07 09:02:56 +08:00
whimlex 88bbd70102 项目名称导航；问题跟踪页面项目导航到问题列表页面；IE问题跟踪页面缩略图显示 2015-04-30 17:24:30 +08:00
whimlex e30c446847 项目私有问题提示信息 2015-04-27 17:49:05 +08:00
whimlex 40fdda0ee2 版本库git帮助文档的显示与隐藏 2015-04-27 16:58:16 +08:00
whimlex eba638b42e 问题跟踪编辑、更新的权限控制 2015-04-27 14:41:27 +08:00
guange 449bbc553c 修复issue界面js报错 2015-04-24 15:20:47 +08:00
huang 7e7ff92f7c issueenter键不能搜索的问题 2015-04-23 17:02:26 +08:00
huang 4c1259ff92 缺陷enter键盘不能搜索（未完成） 2015-04-23 16:56:18 +08:00
huang 0484692b47 缺陷显示页面虚线多余 2015-04-22 17:57:36 +08:00
huang 5bfef259de 去掉缺陷列表空白处的链接 2015-04-21 15:22:27 +08:00
huang 2521e802bf 缺陷统计添加冒号 2015-04-21 14:48:49 +08:00
huang 5c2fdf7aee Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-21 14:20:13 +08:00
huang dd25cdc065 1、修改项目三种类型术语 
2、未登录情况下缺陷提交bug
3、width果断空白处点击进入
 2015-04-21 14:19:50 +08:00
lizanle 3b70ab964d issue过滤 2015-04-21 09:53:09 +08:00
whimlex dc955c7e2d 编辑问题时，编辑问题状态，开始时间、计划完成时间右侧的时间选择器不见了 2015-04-17 14:14:13 +08:00
huang 1961768031 新建问题前去掉不必要的* 
去掉跟踪功能
 2015-04-17 10:37: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 0ea683e1b4 修改issue中图片附件的缩略图显示方式 2015-04-17 07:45:37 +08:00
whimlex 8babe384fd 缺陷历史记录调整 2015-04-16 20:11:33 +08:00
whimlex fc106fef49 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-16 17:56:52 +08:00
whimlex e9cf61e0f4 缺陷状态根据完成度调整 2015-04-16 17:56:19 +08:00
huang ce5b2d9996 项目讨论区回复按钮 2015-04-16 17:29:04 +08:00
huang 611952eb05 新建项目时候设定默认项目类型 
新建项目样式异常调整
 2015-04-16 16:36:34 +08:00
huang be97e4732d 目标版本为空的不显示 2015-04-16 15:58:38 +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 d23ac832ca 项目页面搜索按钮功能实现；问题跟踪页面编辑按钮功能实现；问题跟踪页面样式调整 2015-04-16 04:12:26 +08:00
whimlex 596e89a14f 缺陷更新页面 2015-04-15 20:05:21 +08:00
huang 45c234bf9c Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 18:14:10 +08:00
huang aff58dd3a7 添加关注者 2015-04-15 18:13:51 +08:00
whimlex 30dae089c6 新建缺陷页面主题不能为空 2015-04-15 17:28:53 +08:00
whimlex 521e000c74 commmit 2015-04-15 17:17:03 +08:00
whimlex d68b0283eb Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 17:06:56 +08:00
whimlex a10ced61ec 缺陷跟踪者 2015-04-15 17:06:40 +08:00
huang 3825252327 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 16:38:58 +08:00
huang 104075b3fd 修改缺陷留言方式 2015-04-15 16:38:39 +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
huang 4d0a9bd35c 部分描述增加强制换行 2015-04-15 15:30:33 +08:00
huang 0023d0610b 缺陷主题、描述强制换行 
跟踪按钮样式
引用样式修改
 2015-04-15 15:15:51 +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
huang afa5c3a4f9 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-04-15 11:15:44 +08:00
huang bfe0176b74 修改附件显示样式 2015-04-15 11:15:25 +08:00