From ef61e41d4877437d46bf571be1bd8e994778aa0a Mon Sep 17 00:00:00 2001 From: nwb Date: Mon, 23 Jun 2014 16:00:10 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/index.html.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 79001a3f5..16a4cbf21 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -54,7 +54,7 @@ @@ -88,7 +88,7 @@
<%activities = find_all_activities%> <% activities.each do |event| %> - <% cache cache_key_for_event(event) do %> +
  • <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %> @@ -99,7 +99,7 @@

    <%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前     <%= show_event_reply event %>

    • - <% end %> + <% end %>
    @@ -107,7 +107,7 @@
    From 067a2d78414be8798a9e2d333c2b90cb75c12a19 Mon Sep 17 00:00:00 2001 From: nwb Date: Mon, 23 Jun 2014 16:13:00 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9C=AA=E6=89=BE=E5=88=B0=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/file_not_found.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/file_not_found.html b/public/file_not_found.html index 80b0e3dde..5b9b8bc1d 100644 --- a/public/file_not_found.html +++ b/public/file_not_found.html @@ -1,7 +1,7 @@ -文件未找到 +File not found -

    文件已经损坏

    -

    抱歉，因文件已经损坏，请重新上传此文件.

    +

    Sorry, this file can not be downloaded now.

    +

    Trustie Team.

    Back

    From 7ba723e582978512d3f295eba2ee92c44a840d17 Mon Sep 17 00:00:00 2001 From: linchun Date: Mon, 23 Jun 2014 17:16:12 +0800 Subject: [PATCH 3/7] bundle mysql connetion version --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 400cdab3c..f5d88fb48 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,7 @@ if File.exist?(database_file) adapters.each do |adapter| case adapter when 'mysql2' - gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw] + gem "mysql2", "= 0.3.11", :platforms => [:mri, :mingw] gem "activerecord-jdbcmysql-adapter", :platforms => :jruby when 'mysql' gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw] From 26b92a925fb7b2071d741fa7a473caf4ddd821aa Mon Sep 17 00:00:00 2001 From: nwb Date: Mon, 23 Jun 2014 17:35:12 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=B5=8B=E8=AF=95gem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 10 +++++----- Gemfile.lock | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index f5d88fb48..f12958ef0 100644 --- a/Gemfile +++ b/Gemfile @@ -45,10 +45,10 @@ end group :test do # shoulda的版本做了改动 #gem "shoulda", "~> 3.3.2" - gem "shoulda", "> 3.3.2" - gem "mocha", "~> 0.13.3" - gem 'capybara', '~> 2.0.0' - gem 'nokogiri', '< 1.6.0' + #gem "shoulda", "> 3.3.2" + #gem "mocha", "~> 0.13.3" + #gem 'capybara', '~> 2.0.0' + #gem 'nokogiri', '< 1.6.0' end platforms :mri, :mingw do @@ -56,7 +56,7 @@ platforms :mri, :mingw do # RMagick 2 supports ruby 1.9 # RMagick 1 would be fine for ruby 1.8 but Bundler does not support # different requirements for the same gem on different platforms - gem "rmagick", ">= 2.0.0" + #gem "rmagick", ">= 2.0.0" end end diff --git a/Gemfile.lock b/Gemfile.lock index 14f6aa047..189cbabce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -174,7 +174,7 @@ DEPENDENCIES i18n (~> 0.6.0) jquery-rails (~> 2.0.2) mocha (~> 0.13.3) - mysql2 (~> 0.3.11) + mysql2 (= 0.3.11) net-ldap (~> 0.3.1) nokogiri (< 1.6.0) rack-mini-profiler! From df89e5e173e2ab39b95271ba1996903becd51537 Mon Sep 17 00:00:00 2001 From: z9hang Date: Mon, 23 Jun 2014 17:49:20 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=A4=9A=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=88=86=E6=95=B0=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_users.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 948a7e3f3..b4e1e4eef 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -121,7 +121,7 @@ - + + --> From e367c03f6e25ed87f9fcfc1414a427d49a813c4a Mon Sep 17 00:00:00 2001 From: nwb Date: Mon, 23 Jun 2014 17:50:45 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BABUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile.lock | 35 -------------------------- app/controllers/projects_controller.rb | 3 +++ 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 189cbabce..7b18882b9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,15 +52,6 @@ GEM rails (>= 3, < 5) arel (3.0.2) builder (3.0.0) - capybara (2.0.3) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - selenium-webdriver (~> 2.0) - xpath (~> 1.0.0) - childprocess (0.5.3) - ffi (~> 1.0, >= 1.0.11) coderay (1.0.9) coffee-rails (3.2.2) coffee-script (>= 2.2.0) @@ -73,7 +64,6 @@ GEM execjs (1.4.0) multi_json (~> 1.0) fastercsv (1.5.0) - ffi (1.9.3-x86-mingw32) hike (1.2.3) i18n (0.6.1) journey (1.0.4) @@ -84,14 +74,10 @@ GEM mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) - metaclass (0.0.4) mime-types (1.23) - mocha (0.13.3) - metaclass (~> 0.0.1) multi_json (1.7.6) mysql2 (0.3.11-x86-mingw32) net-ldap (0.3.1) - nokogiri (1.5.11-x86-mingw32) polyglot (0.3.3) rack (1.4.5) rack-cache (1.2) @@ -121,25 +107,12 @@ GEM rake (10.3.2) rdoc (3.12.2) json (~> 1.4) - rmagick (2.13.2) ruby-openid (2.1.8) - rubyzip (1.1.4) sass (3.2.7) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) tilt (~> 1.3) - selenium-webdriver (2.42.0) - childprocess (>= 0.5.0) - multi_json (~> 1.0) - rubyzip (~> 1.0) - websocket (~> 1.0.4) - shoulda (3.5.0) - shoulda-context (~> 1.0, >= 1.0.1) - shoulda-matchers (>= 1.4.1, < 3.0) - shoulda-context (1.2.1) - shoulda-matchers (2.6.1) - activesupport (>= 3.0.0) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -154,9 +127,6 @@ GEM uglifier (1.0.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) - websocket (1.0.7) - xpath (1.0.0) - nokogiri (~> 1.3) PLATFORMS x86-mingw32 @@ -167,22 +137,17 @@ DEPENDENCIES acts-as-taggable-on (= 2.4.1) better_errors! builder (= 3.0.0) - capybara (~> 2.0.0) coderay (~> 1.0.6) coffee-rails (~> 3.2.1) fastercsv (~> 1.5.0) i18n (~> 0.6.0) jquery-rails (~> 2.0.2) - mocha (~> 0.13.3) mysql2 (= 0.3.11) net-ldap (~> 0.3.1) - nokogiri (< 1.6.0) rack-mini-profiler! rack-openid rails (= 3.2.13) - rmagick (>= 2.0.0) ruby-openid (~> 2.1.4) sass-rails (~> 3.2.3) seems_rateable! - shoulda (> 3.3.2) uglifier (>= 1.0.3) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index ad3dc3dca..33adb3ac9 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -372,6 +372,9 @@ class ProjectsController < ApplicationController @bids = @bids.offset(@offset).limit(@limit).all.reverse else limit = @bid_count % @limit + if limit == 0 + limit = 10 + end @bids = @bids.offset(@offset).limit(limit).all.reverse end render :layout => 'base_courses' From ead7fca3f831c8b0ecb1010b3e956354c75d9daf Mon Sep 17 00:00:00 2001 From: linchun Date: Mon, 23 Jun 2014 19:11:58 +0800 Subject: [PATCH 7/7] fix gemfie --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index f12958ef0..004f35f20 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ group :assets do gem 'coffee-rails', '~> 3.2.1' # See https://github.com/sstephenson/execjs#readme for more supported runtimes - # gem 'therubyracer', :platforms => :ruby + gem 'therubyracer', :platforms => :ruby gem 'uglifier', '>= 1.0.3' end