From 7d70e63f8df5dc7b9ba749ffe49bdd9e9f155bd1 Mon Sep 17 00:00:00 2001 From: luoquan <545501972@qq.com> Date: Fri, 11 Mar 2016 10:18:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_user_message_userfeedaback.html.erb | 58 +- db/schema.rb | 1 - .../javascripts/code_review.js | 706 +- .../stylesheets/activity.css | 6 +- .../stylesheets/code_review.css | 192 +- .../stylesheets/window_js/MIT-LICENSE | 38 +- .../stylesheets/window_js/alert.css | 238 +- .../stylesheets/window_js/alert_lite.css | 176 +- .../stylesheets/window_js/alphacube.css | 300 +- .../stylesheets/window_js/behavior.htc | 100 +- .../stylesheets/window_js/darkX.css | 242 +- .../stylesheets/window_js/debug.css | 50 +- .../stylesheets/window_js/default.css | 310 +- .../stylesheets/window_js/iefix/iepngfix.css | 6 +- .../stylesheets/window_js/iefix/iepngfix.htc | 106 +- .../stylesheets/window_js/lighting.css | 1920 +-- .../window_js/lighting/pngbehavior.htc | 134 +- .../stylesheets/window_js/mac_os_x.css | 666 +- .../stylesheets/window_js/mac_os_x_dialog.css | 320 +- .../stylesheets/window_js/nuncio.css | 328 +- .../stylesheets/window_js/spread.css | 216 +- public/stylesheets/base.css | 216 +- public/stylesheets/bootstrap.css | 13600 ++++++++-------- public/stylesheets/leftside.css | 132 +- public/stylesheets/leftside_new.css | 134 +- public/stylesheets/prettify.css | 174 +- public/stylesheets/public_new.css | 1606 +- public/stylesheets/repository.css | 578 +- public/stylesheets/user_leftside.css | 136 +- public/stylesheets/users.css | 308 +- script/delayed_job | 10 +- .../blog_comments_controller_spec.rb | 10 +- spec/controllers/blogs_controller_spec.rb | 10 +- .../org_courses_controller_spec.rb | 10 +- .../org_document_comment_controller_spec.rb | 10 +- .../controllers/org_member_controller_spec.rb | 10 +- .../org_projects_controller_spec.rb | 10 +- .../org_subfields_controller_spec.rb | 10 +- .../organizations_controller_spec.rb | 10 +- .../shield_activities_controller_spec.rb | 10 +- .../system_messages_controller_spec.rb | 10 +- spec/factories/at_messages.rb | 24 +- spec/factories/attachment_histories.rb | 12 +- spec/factories/attachments.rb | 20 +- spec/factories/blog_comments.rb | 12 +- spec/factories/blogs.rb | 12 +- spec/factories/course_contributor_scores.rb | 26 +- spec/factories/course_messages.rb | 20 +- spec/factories/courses.rb | 30 +- spec/factories/dts.rb | 38 +- spec/factories/forge_messages.rb | 20 +- spec/factories/homework_detail_groups.rb | 22 +- spec/factories/homeworks.rb | 34 +- spec/factories/invite_lists.rb | 14 +- spec/factories/memo_messages.rb | 20 +- spec/factories/message_alls.rb | 16 +- spec/factories/onclick_times.rb | 14 +- spec/factories/org_activities.rb | 12 +- spec/factories/org_document_comments.rb | 22 +- spec/factories/org_members.rb | 16 +- spec/factories/principal_activities.rb | 20 +- spec/factories/student_work_projects.rb | 12 +- spec/factories/system_messages.rb | 16 +- spec/factories/user_feedback_messages.rb | 18 +- spec/models/at_message_spec.rb | 10 +- spec/models/attachment_history_spec.rb | 10 +- spec/models/course_contributor_score_spec.rb | 10 +- spec/models/course_message_spec.rb | 10 +- spec/models/dts_spec.rb | 10 +- spec/models/forge_activity_spec.rb | 10 +- spec/models/forge_message_spec.rb | 10 +- spec/models/homework_detail_group_spec.rb | 10 +- spec/models/invite_list_spec.rb | 10 +- spec/models/memo_message_spec.rb | 10 +- spec/models/message_all_spec.rb | 10 +- spec/models/onclick_time_spec.rb | 10 +- spec/models/org_activity_spec.rb | 10 +- spec/models/org_document_comment_spec.rb | 10 +- spec/models/org_member_spec.rb | 10 +- spec/models/organization_spec.rb | 10 +- spec/models/phone_app_version_spec.rb | 10 +- spec/models/principal_activity_spec.rb | 10 +- spec/models/student_work_project_spec.rb | 10 +- spec/models/system_message_spec.rb | 10 +- spec/models/user_feedback_message_spec.rb | 10 +- spec/rails_helper.rb | 100 +- spec/requests/account_request_spec.rb | 174 +- spec/requests/avatar_request_spec.rb | 30 +- spec/requests/course_request_spec.rb | 176 +- spec/requests/gitlab_request_spec.rb | 26 +- spec/requests/homework_request_spec.rb | 104 +- spec/requests/zipdown_request_spec.rb | 80 +- spec/seeds.rb | 36 +- spec/shared_account_spec.rb | 84 +- spec/spec_helper.rb | 182 +- spec/support/spork_patch.rb | 44 +- test/fixtures/course_groups.yml | 22 +- test/mobile/auth_test.rb | 48 +- test/mobile/users_test.rb | 24 +- test/unit/course_group_test.rb | 34 +- test/unit/helpers/expire_helper_test.rb | 8 +- test/unit/helpers/system_log_helper_test.rb | 8 +- 102 files changed, 12473 insertions(+), 12474 deletions(-) diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb index 23a0774c3..6bc169f21 100644 --- a/app/views/users/_user_message_userfeedaback.html.erb +++ b/app/views/users/_user_message_userfeedaback.html.erb @@ -1,30 +1,30 @@ -<% if ma.class == UserFeedbackMessage %> - <% if ma.journals_for_message_type == "JournalsForMessage" %> -
","").gsub("
","").gsub("","").gsub("
","").gsub("