修正注册

12 years ago · 14fb820df3
parent 2e0502c28e
commit 14fb820df3
8 changed files with 41 additions and 77 deletions
--- a/16
+++ b/16
@ -20,14 +20,7 @@ group :openid do
 end

 # Optional gem for exporting the gantt to a PNG file, not supported with jruby
-platforms :mri, :mingw do
-  group :rmagick 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"
-  end
-end
+

 platforms :jruby do
  # jruby-openssl is bundled with JRuby 1.7.0
@ -74,14 +67,9 @@ end

 group :development do
  gem "rdoc", ">= 2.4.2"
-  gem "yard"
 end

-group :test do
-  gem "shoulda", "~> 3.3.2"
-  gem "mocha", "~> 0.12.3"
-  gem 'capybara', '~> 2.0.0'
-end
+

 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
 if File.exists?(local_gemfile)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -32,19 +32,9 @@ 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.3.9)
-      ffi (~> 1.0, >= 1.0.11)
    coderay (1.0.9)
    erubis (2.7.0)
-    fastercsv (1.5.5)
-    ffi (1.9.0-x86-mingw32)
+    fastercsv (1.5.0)
    hike (1.2.3)
    i18n (0.6.1)
    journey (1.0.4)
@ -55,17 +45,10 @@ GEM
    mail (2.5.4)
      mime-types (~> 1.16)
      treetop (~> 1.4.8)
-    metaclass (0.0.1)
    mime-types (1.23)
-    mini_portile (0.5.0)
-    mocha (0.12.10)
-      metaclass (~> 0.0.1)
    multi_json (1.7.6)
    mysql2 (0.3.11-x86-mingw32)
    net-ldap (0.3.1)
-    nokogiri (1.6.0-x86-mingw32)
-      mini_portile (~> 0.5.0)
-    pg (0.14.1-x86-mingw32)
    polyglot (0.3.3)
    rack (1.4.5)
    rack-cache (1.2)
@ -95,38 +78,18 @@ GEM
    rake (10.0.4)
    rdoc (3.12.2)
      json (~> 1.4)
-    rmagick (2.13.2)
    ruby-openid (2.1.8)
-    rubyzip (0.9.9)
-      jquery-rails
-      rails
-    selenium-webdriver (2.33.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip
-      websocket (~> 1.0.4)
-    shoulda (3.3.2)
-      shoulda-context (~> 1.0.1)
-      shoulda-matchers (~> 1.4.1)
-    shoulda-context (1.0.2)
-    shoulda-matchers (1.4.1)
-      activesupport (>= 3.0.0)
    sprockets (2.2.2)
      hike (~> 1.2)
      multi_json (~> 1.0)
      rack (~> 1.0)
      tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.7-x86-mingw32)
    thor (0.18.1)
    tilt (1.4.1)
    treetop (1.4.14)
      polyglot
      polyglot (>= 0.3.1)
    tzinfo (0.3.37)
-    websocket (1.0.7)
-    xpath (1.0.0)
-      nokogiri (~> 1.3)
-    yard (0.8.6.1)

 PLATFORMS
  x86-mingw32
@ -134,24 +97,15 @@ PLATFORMS
 DEPENDENCIES
  activerecord-jdbc-adapter (= 1.2.5)
  activerecord-jdbcmysql-adapter
-  activerecord-jdbcpostgresql-adapter
-  activerecord-jdbcsqlite3-adapter
  acts-as-taggable-on
  builder (= 3.0.0)
-  capybara (~> 2.0.0)
  coderay (~> 1.0.6)
  fastercsv (~> 1.5.0)
  i18n (~> 0.6.0)
  jquery-rails (~> 2.0.2)
-  mocha (~> 0.12.3)
  mysql2 (~> 0.3.11)
  net-ldap (~> 0.3.1)
-  pg (>= 0.11.0)
  rack-openid
  rails (= 3.2.13)
  rdoc (>= 2.4.2)
-  rmagick (>= 2.0.0)
  ruby-openid (~> 2.1.4)
-  shoulda (~> 3.3.2)
-  sqlite3
-  yard
--- a/app/controllers/shell/shell
+++ b/app/controllers/shell/shell
--- a/app/views/account/register.html.erb
+++ b/app/views/account/register.html.erb
@ -16,6 +16,8 @@
 <p><%= f.text_field :firstname, :required => true %></p>
 <p><%= f.text_field :lastname, :required => true %></p>
 <p><%= f.text_field :mail, :required => true %></p>
+<p>
+	<em class="info"><%="#{l(:label_mail_attention)} "%></em></p>
 <p><%= f.select :language, lang_options_for_select %></p>

 <% if Setting.openid? %>
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@ -33,6 +33,7 @@
 				<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
 				<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
 				<%= sort_header_tag('mail', :caption => l(:field_mail)) %>
+	
 				<%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
 				<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
 				<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
--- a/config/database.yml
+++ b/config/database.yml
@ -1,20 +1,23 @@
-# Default setup is given for MySQL with ruby1.8. If you're running Redmine
-# with MySQL and ruby1.9, replace the adapter name with `mysql2`.
-# Examples for PostgreSQL and SQLite3 can be found at the end.
+# Default setup is given for MySQL with ruby1.9. If you're running Redmine
+# with MySQL and ruby1.8, replace the adapter name with `mysql`.
+# Examples for PostgreSQL, SQLite3 and SQL Server can be found at the end.
+# Line indentation must be 2 spaces (no tabs).

 production:
  adapter: mysql2
  database: bitnami_redmine
-  host: 10.0.47.245
+  host: 192
+  socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
  port: 3306
  username: root
-  password: "bitnami"
+  password: "1234"
  encoding: utf8

 development:
  adapter: mysql2
  database: bitnami_redmine
  host: 10.0.47.245
+  #socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
  port: 3306
  username: root
  password: "bitnami"
@ -26,20 +29,34 @@ development:
 test:
  adapter: mysql2
  database: bitnami_redmine
-  host: 10.0.47.121
+  host: 192.168.83.251
+  socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
  port: 3306
  username: root
-  password: "7a9dca93e6"
+  password: "1234"
  encoding: utf8

-test_pgsql:
-  adapter: postgresql
-  database: bitnami_redmine
-  host: 10.0.47.121
+# PostgreSQL configuration example
+#production:
+#  adapter: mysql2
+#  database: bitnami_redmine
+#  host: localhost
+  socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
  port: 3306
-  username: root
-  password: "1234"
+#  username: bitnami
+#  password: "c16af1e560"

-test_sqlite3:
-  adapter: sqlite3
-  database: bitnami_redmine
+# SQLite3 configuration example
+#production:
+#  adapter: mysql2
+#  database: bitnami_redmine
+
+# SQL Server configuration example
+#production:
+#  adapter: mysql2
+#  database: bitnami_redmine
+#  host: localhost
+  socket: /home/pdl/redmine-2.3.1-2/mysql/tmp/mysql.sock
+  port: 3306
+#  username: bitnami
+#  password: "c16af1e560"
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@ -1247,3 +1247,4 @@ en:
  label_all_revisions: All revisions：
  label_repository_name: Repository name
  label_upassword_info: The password can be shared in the group
+  label_mail_attention: qq-mail may not receive this message,if other mailboxes don't receive mails,the mails may be among spam.
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@ -1259,3 +1259,4 @@ zh:
  label_max_number: 至多25个字符。
  label_all_revisions: 所有版本：
  label_upassword_info: 该密码在项目组内可共享
+  label_mail_attention: qq邮箱可能收不到此邮件，其他邮箱如果没有收到可能在垃圾邮件中