 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
|
bcf83328f2
|
项目界面国际化
|
2015-04-09 20:46:48 +08:00 |
|
huang
|
c8f9add566
|
修改项目成员邀请界面（添加按钮点击搜索）
|
2015-04-09 11:20:09 +08:00 |
|
huang
|
4d4e1cac8b
|
完成新的邮件邀请界面
|
2015-04-09 10:25:46 +08:00 |
|
whimlex
|
aee987d634
|
邀请Trustie用户
|
2015-03-13 17:47:58 +08:00 |
 sw
|
312d7660b2
|
增加邀请成功后的提示
邀请成功后跳转页面修改
调整翻页控件的样式
|
2015-03-12 16:32:20 +08:00 |
|
sw
|
2ee04d55f2
|
修改项目邀请用户的界面
|
2015-03-12 15:46:24 +08:00 |
|
huang
|
0402fee6de
|
修改邮件邀请
|
2015-03-09 11:31:42 +08:00 |
|
huang
|
ba09213023
|
添加新闻模块、部分样式
|
2015-03-07 15:32:50 +08:00 |
 alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
2015-03-07 10:52:20 +08:00 |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
2015-03-07 09:32:27 +08:00 |