Merge branch 'master' of git://github.com/diaspora/diaspora

9 files changed, 59 insertions, 18 deletions

diff --git a/config/application.yml.example b/config/application.yml.example
index 0be3aa125..6577ffd9d 100644
--- a/config/application.yml.example
+++ b/config/application.yml.example
@@ -154,3 +154,12 @@ test:
   open_invitations: false
 
 
+integration_1:
+  <<: *defaults
+  pod_url: "http://localhost:45789"
+  enable_splunk_logging: false
+  
+integration_2:
+  <<: *defaults
+  pod_url: "http://localhost:34658"
+  enable_splunk_logging: false
diff --git a/config/environments/integration_1.rb b/config/environments/integration_1.rb
index 1279e645a..86f1c3043 100644
--- a/config/environments/integration_1.rb
+++ b/config/environments/integration_1.rb
@@ -15,13 +15,12 @@ Diaspora::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = false
   config.active_support.deprecation = :log
-  #config.threadsafe!
+  config.threadsafe!
 
   # Monkeypatch around the nasty "2.5MB exception page" issue, caused by very large environment vars
   # This snippet via: http://stackoverflow.com/questions/3114993/exception-pages-in-development-mode-take-upwards-of-15-30-seconds-to-render-why
diff --git a/config/initializers/locale.rb b/config/initializers/locale.rb
index 79a74a2ee..86ae3c07b 100644
--- a/config/initializers/locale.rb
+++ b/config/initializers/locale.rb
@@ -14,13 +14,3 @@ AVAILABLE_LANGUAGE_CODES.each do |c|
     I18n.fallbacks[c.to_sym] = [c.to_sym, DEFAULT_LANGUAGE.to_sym, :en]
   end
 end
-
-# Workaround for https://rails.lighthouseapp.com/projects/8994/tickets/5329-using-i18nwith_locale-in-actionmailer-raises-systemstackerror
-module AbstractController
-  class I18nProxy
-    def initialize(i18n_config, lookup_context)
-      @i18n_config, @lookup_context = i18n_config, lookup_context
-      @i18n_config = @i18n_config.i18n_config if @i18n_config.respond_to?(:i18n_config)
-    end
-  end
-end
diff --git a/config/initializers/mailer_config.rb b/config/initializers/mailer_config.rb
index 0f154d3e9..a42f539c3 100644
--- a/config/initializers/mailer_config.rb
+++ b/config/initializers/mailer_config.rb
@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 Diaspora::Application.configure do
-  config.action_mailer.default_url_options = {:host => AppConfig[:pod_uri].host}
+  config.action_mailer.default_url_options = {:host => AppConfig[:pod_uri].authority }
   unless Rails.env == 'test' || AppConfig[:mailer_on] != true
     if AppConfig[:mailer_method] == "sendmail"
       config.action_mailer.delivery_method = :sendmail
diff --git a/config/initializers/patch_openssl_pkey.rb b/config/initializers/patch_openssl_pkey.rb
new file mode 100644
index 000000000..ef6b1ddfe
--- /dev/null
+++ b/config/initializers/patch_openssl_pkey.rb
@@ -0,0 +1,14 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+#
+#
+#
+#Why? as of rails 3.0.4, objects are marshalled by calling to yaml, if it is a text field in the db. since we assume things are strings coming out, and pkey does not seem to define a to_yaml, it was getting set to nil
+class OpenSSL::PKey::RSA
+  def to_yaml
+    self.to_s
+  end
+end
+
+
diff --git a/config/locales/diaspora/en-US.yml b/config/locales/diaspora/en-US.yml
index 55523b72a..8cb2569f2 100644
--- a/config/locales/diaspora/en-US.yml
+++ b/config/locales/diaspora/en-US.yml
@@ -26,3 +26,4 @@
                   attributes:
                       from_id:
                           taken: "is a duplicate of a pre-existing request."
+
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index cf1a843d4..24a291caf 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -65,8 +65,10 @@ en:
           attributes:
             from_id:
               taken: "is a duplicate of a pre-existing request."
-
-
+        reshare:
+          attributes:
+            root_guid:
+              taken: "You've already reshared that post!"
   error_messages:
     helper:
       invalid_fields: "Invalid Fields"
@@ -420,7 +422,9 @@ en:
     liked:
         liked: "%{name} just liked your post"
         view_post: "View post >"
-
+    confirm_email:
+        subject: "Please activate your new e-mail address %{unconfirmed_email}"
+        click_link: "To activate your new e-mail address %{unconfirmed_email}, please click this link:"
   people:
     zero: "no people"
     one: "1 person"
@@ -577,7 +581,19 @@ en:
         few: "%{count} new requests!"
         many: "%{count} new requests!"
         other: "%{count} new requests!"
-
+  reshares:
+    reshare:
+      reshare:
+        zero: "Reshare"
+        one: "1 Reshare"
+        few: "%{count} Reshares"
+        many: "%{count} Reshares"
+        other: "%{count} Reshares"
+      show_original: "Show Original"
+      reshare_confirmation: "Reshare %{author} - %{text}?"
+      deleted: "Original post deleted by author."
+    create:
+      failure: "There was an error resharing this post."
   services:
     index:
       logged_in_as: "logged in as"
@@ -723,6 +739,7 @@ en:
       close_account: "Close Account"
       change_language: "Change Language"
       change_password: "Change Password"
+      change_email: "Change E-Mail"
       new_password: "New Password"
       current_password: "Current password"
       download_xml: "download my xml"
@@ -738,6 +755,7 @@ en:
       private_message: "...you receive a private message?"
       liked: "...someone likes your post?"
       change: "Change"
+      email_awaiting_confirmation: "We have sent you an activation link to %{unconfirmed_email}. Till you follow this link and activate the new address, we will continue to use your original address %{email}."
     destroy: "Your account has been locked.  It may take 20 minutes for us to finish closing your account.  Thank you for trying Diaspora."
     getting_started:
       welcome: "Welcome to Diaspora!"
@@ -761,8 +779,13 @@ en:
       language_changed: "Language Changed"
       language_not_changed: "Language Change Failed"
       email_notifications_changed: "Email notifications changed"
+      unconfirmed_email_changed: "E-Mail Changed. Needs activation."
+      unconfirmed_email_not_changed: "E-Mail Change Failed"
     public:
       does_not_exist: "User %{username} does not exist!"
+    confirm_email:
+      email_confirmed: "E-Mail %{email} activated"
+      email_not_confirmed: "E-Mail could not be activated. Wrong link?"
 
   webfinger:
     fetch_failed: "failed to fetch webfinger profile for %{profile_url}"
diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml
index 41e44f1db..bd393d873 100644
--- a/config/locales/javascript/javascript.en.yml
+++ b/config/locales/javascript/javascript.en.yml
@@ -47,3 +47,5 @@ en:
       comments:
         show: "show all comments"
         hide: "hide comments"
+      reshares:
+        duplicate:"You've already reshared that post!"
diff --git a/config/routes.rb b/config/routes.rb
index bca90dd5c..42ff03d3f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,6 +6,8 @@ Diaspora::Application.routes.draw do
 
   # Posting and Reading
 
+  resources :reshares
+
   resources :aspects do
     put :toggle_contact_visibility
   end
@@ -16,7 +18,7 @@ Diaspora::Application.routes.draw do
     resources :likes, :only => [:create, :destroy, :index]
     resources :comments, :only => [:create, :destroy, :index]
   end
-  get 'p/:id' => 'publics#post', :as => 'public_post'
+  get 'p/:guid' => 'publics#post', :as => 'public_post'
 
   # roll up likes into a nested resource above
   resources :comments, :only => [:create, :destroy] do
@@ -68,6 +70,7 @@ Diaspora::Application.routes.draw do
     get 'public/:username'          => :public,          :as => 'users_public'
     match 'getting_started'         => :getting_started, :as => 'getting_started'
     get 'getting_started_completed' => :getting_started_completed
+    get 'confirm_email/:token'      => :confirm_email,   :as => 'confirm_email'
   end
 
   # This is a hack to overide a route created by devise.