diff --git a/Gemfile b/Gemfile index 6d9bb4ad..7309c6e9 100644 --- a/Gemfile +++ b/Gemfile @@ -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) diff --git a/Gemfile.lock b/Gemfile.lock index 6713a997..d60847b1 100644 --- 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 diff --git a/app/controllers/shell/shell b/app/controllers/shell/shell new file mode 100644 index 00000000..e69de29b diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 0bf1567e..d268e100 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1300,6 +1300,14 @@ module ApplicationHelper #added by nie # Display watcher picture + def show_more_watchers?(obj) + if User.watched_by(obj.id).count > 12 + return true + else + return false + end + end + def show_watcher_profile(obj) count = 0 html = '' @@ -1314,6 +1322,14 @@ module ApplicationHelper end #display fans picture + def show_more_fans?(obj) + if obj.watcher_users.count > 12 + return true + else + return false + end + end + def show_fans_picture(obj) html = '' count = 0 diff --git a/app/views/account/register.html.erb b/app/views/account/register.html.erb index 77cdf9a1..8264a489 100644 --- a/app/views/account/register.html.erb +++ b/app/views/account/register.html.erb @@ -16,6 +16,8 @@

<%= f.text_field :firstname, :required => true %>

<%= f.text_field :lastname, :required => true %>

<%= f.text_field :mail, :required => true %>

+

+ <%="#{l(:label_mail_attention)} "%>

<%= f.select :language, lang_options_for_select %>

<% if Setting.openid? %> diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb index 73671d85..15f92f97 100644 --- a/app/views/issues/_form.html.erb +++ b/app/views/issues/_form.html.erb @@ -19,6 +19,9 @@ <% if @issue.safe_attribute? 'subject' %>

<%= f.text_field :subject, :size => 80, :maxlength => 255, :required => true, :style => "font-size:small" %>

+ +<%= javascript_tag "observeAutocompleteField('issue_subject', '#{escape_javascript auto_complete_issues_path(:project_id => @project, :scope => (Setting.cross_project_issue_relations? ? 'all' : nil))}')" %> + <% end %> <% if @issue.safe_attribute? 'description' %> diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb index bdd46a0c..5a0ac67c 100644 --- a/app/views/layouts/base_bids.html.erb +++ b/app/views/layouts/base_bids.html.erb @@ -82,7 +82,7 @@ <% for user in @bid.watcher_users%> - <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :class => "avatar" %> + <%= link_to image_tag(url_to_avatar(user), :class => "avatar", :title => user.name ), user_path(user), :class => "avatar" %> <% end%> @@ -100,7 +100,7 @@ <% for project in @bid.projects%> - <%= link_to image_tag(url_to_avatar(project), :class => "avatar"), project_path(project), :class => "avatar" %> + <%= link_to image_tag(url_to_avatar(project), :class => "avatar", :title => project.name), project_path(project), :class => "avatar" %> <% end%> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 822e9978..e0df12a0 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -117,10 +117,11 @@ <%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> <%= link_to l(:project_module_boards) ,project_boards_path(@project) %> - <% if @project.identifier = 'trustie' %> + <% if @project.identifier == 'trustie' %> <%=image_tag("/images/sidebar/tool_tag2.png", weight:"15px", height:"15px") %> <%= link_to l(:label_user_response) ,project_feedback_path(@project) %> + <% else %> <% end %> diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index f00000a3..635120f8 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -69,7 +69,7 @@ - +
@@ -86,6 +86,9 @@
<%= l(:label_user_watcher) %> + <% if show_more_watchers?(@user) %> +
<%= link_to l(:label_more), :controller => "users", :action => "user_watchlist"%>
+ <% end %>
@@ -101,6 +104,9 @@
<%= l(:label_user_fans) %> + <% if show_more_fans?(@user) %> +
<%= link_to l(:label_more), :controller => "users", :action => "user_fanslist"%>
+ <% end %>
diff --git a/app/views/projects/feedback.html.erb b/app/views/projects/feedback.html.erb index 8f316527..23fbda04 100644 --- a/app/views/projects/feedback.html.erb +++ b/app/views/projects/feedback.html.erb @@ -9,11 +9,7 @@
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 46713e9c..55206a83 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -76,7 +76,7 @@ <% end %> <% end %> -如何提交代码 <%= link_to('中文', ch_usage_path)%> <%= link_to('English', en_usage_path)%> +<%= l(:label_how_commit_code) %> <%= link_to(l(:label_how_commit_code_chinese), ch_usage_path)%> <%= link_to('English', en_usage_path)%> diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index a9231921..18b926de 100644 --- 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') %> diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 7231eefc..dc3a7ff4 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -137,7 +137,7 @@ software development and software crowdsourcing. -
+
<%=link_to journal.user, user_path(journal.user)%> - <% if @user == User.current%> - <%= l(:label_leave_me_message) %> - <% else %> - <%= l(:label_leave_others_message) %> - <% end %> + 对项目进行了反馈
@@ -243,7 +243,7 @@ software development and software crowdsourcing.
- +
朋友，系统仍在不断完善，有意见和建议请 <%= toggle_link '点击我', 'put-bid-form', {:focus => 'new_form_project_message'} %>
<%= l(:label_welcome_leave_message) %> <%= toggle_link l(:label_welcome_click_me), 'put-bid-form', {:focus => 'new_form_project_message'} %>
- +
<%= f.text_area 'project_message', :rows => 3, :cols => 65, :value => "#{l(:label_leave_a_message)}", :onfocus => "clearInfo('new_form_project_message','#{l(:label_leave_a_message)}')", :onblur => "showInfo('new_form_project_message','#{l(:label_leave_a_message)}')", :style => "resize: none;", :class => 'noline'%><%= f.text_area 'project_message', :rows => 3, :cols => 65, :value => "我要反馈", :onfocus => "clearInfo('new_form_project_message','我要反馈')", :onblur => "showInfo('new_form_project_message','我要反馈')", :style => "resize: none;", :class => 'noline'%>
diff --git a/config/database.yml b/config/database.yml index dd814a4e..570ee796 100644 --- 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 - port: 3306 - username: root - password: "7a9dca93e6" - encoding: utf8 - -test_pgsql: - adapter: postgresql - 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: "1234" + encoding: utf8 -test_sqlite3: - adapter: sqlite3 - database: bitnami_redmine +# 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: bitnami +# password: "c16af1e560" + +# 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" diff --git a/config/locales/en.yml b/config/locales/en.yml index c04402ce..9f7fa199 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1247,3 +1247,7 @@ en: label_all_revisions: All revisions： label_repository_name: Repository name label_upassword_info: The password can be shared in the group + label_how_commit_code: How to commit code： + label_how_commit_code_chinese: Chinese + label_welcome_leave_message: Friend,the system continues to improve,with the suggestion please + label_welcome_click_me: Click me diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 383d3347..a86c14bc 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1259,3 +1259,7 @@ zh: label_max_number: 至多25个字符。 label_all_revisions: 所有版本： label_upassword_info: 该密码在项目组内可共享 + label_how_commit_code: 如何提交代码： + label_how_commit_code_chinese: 中文 + label_welcome_leave_message: 朋友，系统仍在不断完善，有意见和建议请 + label_welcome_click_me: 点击我