trustieforge

Author	SHA1	Message	Date
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
sw	e579157604	更新public.css 课程讨论区文件按钮和editor靠的太近	11 years ago
huang	df43274565	新版项目界面（部分未完成，先合并） 1、项目框架整理 2、各页面样式	11 years ago
huang	f898e2aa91	16:22	11 years ago