 lizanle
|
a4d6eaa46c
|
跳转回来自动选择tab页
|
10 years ago |
|
lizanle
|
38672458b0
|
新建版本 更改页面
|
10 years ago |
|
lizanle
|
86b05b8e6a
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
10 years ago |
|
lizanle
|
fe94efeb39
|
新建版本更改页面
|
10 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
|
10 years ago |
|
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
10 years ago |
|
huang
|
4d0a9bd35c
|
部分描述增加强制换行
|
10 years ago |
|
huang
|
b7537ad518
|
修改新闻中测出的bug，
讨论区中附件显示形式
|
10 years ago |
|
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
10 years ago |
 sw
|
e4b2092c7f
|
实现项目成员列表增加成员，以及用户/角色留空时的提示信息
|
10 years ago |
|
huang
|
729b28ae43
|
修改项目创始人不能删除自己
|
10 years ago |
|
huang
|
5ae5cfda03
|
项目配置添加申请加入
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
|
10 years ago |
|
huang
|
b98a67f50d
|
完成项目配置-成员模块
|
10 years ago |
|
huang
|
b3c3693d72
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
845794675a
|
配置-成员界面休整
|
10 years ago |
|
sw
|
aee81e8e44
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
10 years ago |
|
huang
|
6b8022cb23
|
清除不需要的子模块
|
10 years ago |
|
huang
|
f3ba393bd4
|
去掉代码审查
修改配置-“版本库”样式
|
10 years ago |
|
huang
|
48f096178c
|
修改配置modoule模块
|
10 years ago |
|
huang
|
2b063db0cc
|
修改版本界面
未完成部分，隔行换色
|
10 years ago |
|
huang
|
6ce998bb54
|
去掉新版本库中冗余代码
|
10 years ago |
|
huang
|
5d249823df
|
修改配置版本库页面
|
10 years ago |
|
sw
|
01f56a761f
|
完成配置---模块
|
10 years ago |
|
sw
|
fb935f124c
|
完成修改项目界面
|
10 years ago |
|
sw
|
7ad3c2d578
|
修改项目配置js
增加项目配置相关子界面
|
10 years ago |
|
huang
|
e3d815b51d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
10 years ago |
|
huang
|
0c90f2361d
|
项目用户反馈页面调整
|
10 years ago |
|
sw
|
db0cc88142
|
静态页面添加
|
10 years ago |
whimlex
|
5936d8d8e9
|
评论显示
|
10 years ago |
|
whimlex
|
69153d2d95
|
项目界面缺失翻译调整
|
10 years ago |
|
whimlex
|
1fae44b201
|
用户主页国际化修改
|
10 years ago |
|
whimlex
|
2a35e771c2
|
项目界面国际化及样式调整；标签模块国际化及样式调整
|
10 years ago |
|
whimlex
|
bcf83328f2
|
项目界面国际化
|
10 years ago |
|
huang
|
f2cf46f0a0
|
修改缺陷列表显示bug
|
10 years ago |
|
huang
|
e907f5e3e4
|
1.解决缺陷列表图片不显示
2、项目种类页面局部刷新
3、工具栏调整
4.项目新增字段（判断种类）
|
10 years ago |
|
huang
|
c8f9add566
|
修改项目成员邀请界面（添加按钮点击搜索）
|
10 years ago |
|
huang
|
4d4e1cac8b
|
完成新的邮件邀请界面
|
10 years ago |
|
huang
|
b415575e0e
|
修改新缺陷列表
完成部分项目配置
|
10 years ago |
|
huang
|
be07c2c961
|
添加项目关注列表
|
10 years ago |
|
huang
|
d832514a55
|
新增项目成员列表
|
10 years ago |
|
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
处理冲突
修改项目动态分页
项目到航天中添加“新建项目”
|
10 years ago |
|
huang
|
df43274565
|
新版项目界面（部分未完成，先合并）
1、项目框架整理
2、各页面样式
|
10 years ago |
|
sw
|
cee08d9c58
|
修改加入课程弹出框样式
|
10 years ago |
|
whimlex
|
82fb9325c5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/_point_browser.html.erb
|
10 years ago |
|
whimlex
|
4de0255ce6
|
邀请邮件国际化；js冲突
|
10 years ago |
|
whimlex
|
05d17361e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/projects/invite_members_by_mail.html.erb
|
10 years ago |
|
whimlex
|
1452e09154
|
邮件邀请邮箱格式自动填充；部分国际化
|
10 years ago |
|
huang
|
75ae68ffc8
|
项目邀请用户邮箱为空的提示语！
|
10 years ago |
|
huang
|
1e1ee9a248
|
修改邮箱匹配错误后提示语
|
10 years ago |
