 huang
|
1fe35fc063
|
配置中添加角色权限判断
不同角色通过admin配置显示不同模块
|
2015-04-21 18:05:35 +08:00 |
 lizanle
|
457b86a861
|
版本配置
|
2015-04-21 10:14:46 +08:00 |
|
huang
|
692500af2e
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-20 14:54:27 +08:00 |
|
huang
|
93e3247685
|
项目名称不能为空提示
|
2015-04-20 14:54:04 +08:00 |
|
huang
|
8dd0e985a0
|
完成
|
2015-04-20 10:48:36 +08:00 |
|
huang
|
7340ef793c
|
修改新建项目的显示样式
|
2015-04-17 16:26:05 +08:00 |
whimlex
|
af28461cf0
|
动态中创建项目样式调整
|
2015-04-17 14:51:10 +08:00 |
|
lizanle
|
0ca96a5500
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-17 14:27:30 +08:00 |
|
lizanle
|
ade32aae02
|
列宽修改
|
2015-04-17 14:27:26 +08:00 |
 sw
|
3a8bfbf880
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 14:22:19 +08:00 |
|
lizanle
|
3c17492901
|
列宽
|
2015-04-17 14:22:08 +08:00 |
|
sw
|
7239f6a641
|
1、成员列表分页空间翻页不可用
2、当五输入时显示，无用户显示
|
2015-04-17 14:21:44 +08:00 |
|
lizanle
|
17f9ed52ce
|
Wiki列宽度
|
2015-04-17 14:21:43 +08:00 |
|
lizanle
|
b6db00643e
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-17 14:20:58 +08:00 |
|
lizanle
|
532a8cb5c3
|
返回的时候展开输入框
|
2015-04-17 14:20:53 +08:00 |
|
huang
|
14a0d885f0
|
settings
|
2015-04-17 13:49:40 +08:00 |
|
lizanle
|
f8951c0044
|
国际化
|
2015-04-17 12:55:07 +08:00 |
|
lizanle
|
5e8848f962
|
国际化
|
2015-04-17 12:44:27 +08:00 |
|
huang
|
917701f09d
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 11:15:43 +08:00 |
|
huang
|
c2c9660a46
|
项目得分界面调整
|
2015-04-17 11:15:27 +08:00 |
|
lizanle
|
8290741746
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-17 11:13:40 +08:00 |
|
lizanle
|
d2b0eae119
|
格式修改
|
2015-04-17 11:13:36 +08:00 |
|
huang
|
1ffa447767
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-17 10:58:54 +08:00 |
|
huang
|
640f6a1ca7
|
邮件发送框距离
去掉讨论区不必要的*
|
2015-04-17 10:58:40 +08:00 |
|
lizanle
|
8cee159cb7
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-17 10:38:54 +08:00 |
|
lizanle
|
e4abc86093
|
版本和版本库bug修改
|
2015-04-17 10:38:39 +08:00 |
|
huang
|
d1e7777040
|
关注列表样式
|
2015-04-16 20:00:07 +08:00 |
|
huang
|
440eb8dc7f
|
1、修改项目成员一排显示
2、项目动态显示强制换行
3、讨论区提示用语
|
2015-04-16 19:08:16 +08:00 |
|
huang
|
611952eb05
|
新建项目时候设定默认项目类型
新建项目样式异常调整
|
2015-04-16 16:36:34 +08:00 |
|
huang
|
bfc83d1a8c
|
解决项目图片不能上传
|
2015-04-16 15:48:13 +08:00 |
|
huang
|
9fa7b04ce5
|
组织不需要必填
|
2015-04-16 15:30:24 +08:00 |
|
lizanle
|
17f495e77b
|
项目 版本 和 版本库 标签改动
|
2015-04-16 14:59:05 +08:00 |
|
lizanle
|
a4d6eaa46c
|
跳转回来自动选择tab页
|
2015-04-16 11:08:00 +08:00 |
|
lizanle
|
38672458b0
|
新建版本 更改页面
|
2015-04-16 11:07:38 +08:00 |
|
lizanle
|
86b05b8e6a
|
Merge remote-tracking branch 'origin/dev_hjq' into dev_hjq
|
2015-04-16 10:51:09 +08:00 |
|
lizanle
|
fe94efeb39
|
新建版本更改页面
|
2015-04-16 10:50:53 +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 |
|
huang
|
115d77dd01
|
圈子JS和modulesJS
版本库删除按钮
|
2015-04-16 09:49:03 +08:00 |
|
huang
|
4d0a9bd35c
|
部分描述增加强制换行
|
2015-04-15 15:30:33 +08:00 |
|
huang
|
b7537ad518
|
修改新闻中测出的bug，
讨论区中附件显示形式
|
2015-04-14 23:58:27 +08:00 |
|
huang
|
b8058c3e12
|
用户邀请加入的时候增加拒绝功能
删除提示星系修改
申请加入模块样式调整
|
2015-04-14 19:34:01 +08:00 |
|
sw
|
e4b2092c7f
|
实现项目成员列表增加成员，以及用户/角色留空时的提示信息
|
2015-04-14 16:56:32 +08:00 |
|
huang
|
729b28ae43
|
修改项目创始人不能删除自己
|
2015-04-14 16:03:47 +08:00 |
|
huang
|
5ae5cfda03
|
项目配置添加申请加入
删除成员局部刷新
编辑成员局部刷新
项目动态国际化错误
|
2015-04-14 15:34:04 +08:00 |
|
huang
|
b98a67f50d
|
完成项目配置-成员模块
|
2015-04-14 11:47:47 +08:00 |
|
huang
|
b3c3693d72
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
|
2015-04-14 10:24:07 +08:00 |
|
huang
|
845794675a
|
配置-成员界面休整
|
2015-04-14 10:23:49 +08:00 |
|
sw
|
aee81e8e44
|
Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
app/views/layouts/base_projects.html.erb
|
2015-04-14 10:19:17 +08:00 |
|
sw
|
fadca9128f
|
完成项目朋友圈、开发组、科研组直接的切换功能
|
2015-04-14 10:17:42 +08:00 |
|
huang
|
6b8022cb23
|
清除不需要的子模块
|
2015-04-14 09:10:14 +08:00 |