whimlex
|
eb1f8acbd3
|
版本库样式修改
|
11 years ago |
|
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
|
11 years ago |
 huang
|
258a023abd
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
fec0a7472d
|
新闻换行处理
|
11 years ago |
|
huang
|
fbcd9f9a96
|
wiki页面调整
|
11 years ago |
|
huang
|
0ea683e1b4
|
修改issue中图片附件的缩略图显示方式
|
11 years ago |
|
whimlex
|
8633ba3325
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
8babe384fd
|
缺陷历史记录调整
|
11 years ago |
|
huang
|
d1e7777040
|
关注列表样式
|
11 years ago |
|
huang
|
63a457674a
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
440eb8dc7f
|
1、修改项目成员一排显示
2、项目动态显示强制换行
3、讨论区提示用语
|
11 years ago |
|
whimlex
|
fc106fef49
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
fb06571918
|
项目讨论区引用强制换行
|
11 years ago |
|
whimlex
|
e9cf61e0f4
|
缺陷状态根据完成度调整
|
11 years ago |
|
huang
|
ce5b2d9996
|
项目讨论区回复按钮
|
11 years ago |
|
huang
|
c852e72e36
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
611952eb05
|
新建项目时候设定默认项目类型
新建项目样式异常调整
|
11 years ago |
 sw
|
a0c6a09e7d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
sw
|
332a9b45fb
|
修改项目上传资源弹框样式
|
11 years ago |
|
huang
|
be97e4732d
|
目标版本为空的不显示
|
11 years ago |
|
huang
|
bfc83d1a8c
|
解决项目图片不能上传
|
11 years ago |
|
huang
|
9fa7b04ce5
|
组织不需要必填
|
11 years ago |
|
huang
|
b92767bbb5
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
b80251a247
|
链接空白处改成不能点击
修复项目标题过长，布局变形
|
11 years ago |
 lizanle
|
9621c35e8b
|
项目 版本 和 版本库 标签改动
|
11 years ago |
|
lizanle
|
10bd7c2855
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
11 years ago |
|
huang
|
3c563eaecb
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
huang
|
bb7904b32f
|
引入JS文件
|
11 years ago |
|
whimlex
|
19cbc34b2b
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
19dd5a9879
|
项目邀请功能和项目更多功能点击事件
|
11 years ago |
|
huang
|
890f36a2d5
|
优化缺陷
|
11 years ago |
|
huang
|
4afd9afd08
|
解决冲突。修改版本页面
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
public/stylesheets/project.css
|
11 years ago |
|
huang
|
08fb04aff4
|
修改版本库样式
|
11 years ago |
|
whimlex
|
20b17f5503
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
whimlex
|
301e44c695
|
修改附件上传功能无效
|
11 years ago |
|
huang
|
8803942a02
|
项目讨论区，引用样式调整
|
11 years ago |
|
huang
|
e34a00f66e
|
讨论区列表样式冲突
|
11 years ago |
|
lizanle
|
d8a4977c4d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
lizanle
|
871623b7c8
|
commit
|
11 years ago |
|
huang
|
c1d997379f
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
lizanle
|
a4d6eaa46c
|
跳转回来自动选择tab页
|
11 years ago |
|
huang
|
284e4938f6
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
11 years ago |
|
lizanle
|
38672458b0
|
新建版本 更改页面
|
11 years ago |
|
huang
|
dc81db1d8b
|
处理讨论区、缺陷列表样式显示异常
|
11 years ago |
|
lizanle
|
86b05b8e6a
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
11 years ago |
|
lizanle
|
fe94efeb39
|
新建版本更改页面
|
11 years ago |
|
huang
|
e2f7da5b99
|
修改里程碑代码
|
11 years ago |
|
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
|
11 years ago |
|
huang
|
bd800a53e4
|
项目简介显示
|
11 years ago |
