You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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
..
btn.png	16:22	10 years ago
close.png	新版项目界面（部分未完成，先合并）	10 years ago
img_project.png	16:22	10 years ago
inputBg.png	16:22	10 years ago
jiantou.jpg	16:22	10 years ago
jiantou1.jpg	16:22	10 years ago
logo.jpg	16:22	10 years ago
pic_01.jpg	新版项目界面（部分未完成，先合并）	10 years ago
pic_ad.png	新版项目界面（部分未完成，先合并）	10 years ago
pic_down.png	新版项目界面（部分未完成，先合并）	10 years ago
pic_project.jpg	新版项目界面（部分未完成，先合并）	10 years ago
pic_question.png	新版项目界面（部分未完成，先合并）	10 years ago
public_icon.png	更新public.css	10 years ago