From 065859b90cc5ef403b8f47bd5394b343e556cc4d Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Wed, 23 Mar 2016 21:48:52 +0100
Subject: upgrade: remove references to RestClient

CouchRest > 1.2 does not use RestClient anymore. So we should not try to
catch its errors.
---
 config/initializers/error_constants.rb | 5 +++++
 config/initializers/validations.rb     | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)
 delete mode 100644 config/initializers/validations.rb

(limited to 'config/initializers')

diff --git a/config/initializers/error_constants.rb b/config/initializers/error_constants.rb
index fdd3624..bf2dad4 100644
--- a/config/initializers/error_constants.rb
+++ b/config/initializers/error_constants.rb
@@ -1,3 +1,8 @@
 require 'ruby-srp'
 
 WRONG_PASSWORD = SRP::WrongPassword
+
+# In case we use a different ORM at some point
+VALIDATION_FAILED = CouchRest::Model::Errors::Validations
+RECORD_NOT_FOUND  = CouchRest::Model::DocumentNotFound
+RESOURCE_NOT_FOUDN = CouchRest::NotFound
diff --git a/config/initializers/validations.rb b/config/initializers/validations.rb
deleted file mode 100644
index e8acfbe..0000000
--- a/config/initializers/validations.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-# In case we use a different ORM at some point
-VALIDATION_FAILED = CouchRest::Model::Errors::Validations
-RECORD_NOT_FOUND  = CouchRest::Model::DocumentNotFound
-RESOURCE_NOT_FOUND  = RestClient::ResourceNotFound
-- 
cgit v1.2.3


From afc1daac6745cd6b4543d2b542c6f03cfc32e1eb Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Thu, 24 Mar 2016 11:24:19 +0100
Subject: upgrade: client_side_validations initializer

---
 config/initializers/client_side_validations.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'config/initializers')

diff --git a/config/initializers/client_side_validations.rb b/config/initializers/client_side_validations.rb
index 252aded..f7a658a 100644
--- a/config/initializers/client_side_validations.rb
+++ b/config/initializers/client_side_validations.rb
@@ -1,9 +1,16 @@
 # ClientSideValidations Initializer
 
-# Uncomment to disable uniqueness validator, possible security issue
-ClientSideValidations::Config.disabled_validators = [:uniqueness]
+# Disabled validators. The uniqueness validator is disabled by default for security issues. Enable it on your own responsibility!
+# ClientSideValidations::Config.disabled_validators = [:uniqueness]
+
+# Uncomment to validate number format with current I18n locale
+# ClientSideValidations::Config.number_format_with_locale = true
 
 # Uncomment the following block if you want each input field to have the validation messages attached.
+#
+# Note: client_side_validation requires the error to be encapsulated within
+# <label for="#{instance.send(:tag_id)}" class="message"></label>
+
 ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
   unless html_tag =~ /^<label/
     %{<div class="field_with_errors">#{html_tag}<label for="#{instance.send(:tag_id)}" class="message">#{instance.error_message.first}</label></div>}.html_safe
@@ -11,4 +18,3 @@ ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
     %{<div class="field_with_errors">#{html_tag}</div>}.html_safe
   end
 end
-
-- 
cgit v1.2.3


From 00fba5114ae2c6176c88ff0ea152576c5bff657d Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 25 Mar 2016 11:06:55 +0100
Subject: upgrade: {File,Dir}.exists? -> exist?

exists? is deprecated in ruby 2.1
---
 config/initializers/customization.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'config/initializers')

diff --git a/config/initializers/customization.rb b/config/initializers/customization.rb
index aaa2939..9f537e9 100644
--- a/config/initializers/customization.rb
+++ b/config/initializers/customization.rb
@@ -26,7 +26,7 @@ Rails.application.config.assets.paths.unshift "#{customization_directory}/styles
 #
 # Copy files to public
 #
-if !defined?(RAKE) && Dir.exists?("#{customization_directory}/public")
+if !defined?(RAKE) && Dir.exist?("#{customization_directory}/public")
   require 'fileutils'
   FileUtils.cp_r("#{customization_directory}/public/.", "#{Rails.root}/public", :preserve => true)
 end
-- 
cgit v1.2.3


From 70d8ffc40ef57efaf75cd51e0c1ca654dc37dd4c Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 26 Mar 2016 18:22:22 +0100
Subject: upgrade: bootstrap control-group -> form-group

---
 config/initializers/simple_form_bootstrap.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'config/initializers')

diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
index c949f5e..f693a4f 100644
--- a/config/initializers/simple_form_bootstrap.rb
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -1,6 +1,6 @@
 # Use this setup block to configure all options available in SimpleForm.
 SimpleForm.setup do |config|
-  config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
+  config.wrappers :bootstrap, :tag => 'div', :class => 'form-group', :error_class => 'error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
@@ -11,7 +11,7 @@ SimpleForm.setup do |config|
     end
   end
 
-  config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+  config.wrappers :prepend, :tag => 'div', :class => "form-group", :error_class => 'error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
@@ -24,7 +24,7 @@ SimpleForm.setup do |config|
     end
   end
 
-  config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+  config.wrappers :append, :tag => 'div', :class => "form-group", :error_class => 'error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
@@ -38,7 +38,7 @@ SimpleForm.setup do |config|
   end
 
   #
-  # when you don't want any bootstrap "control-group" or "controls" wrappers.
+  # when you don't want any bootstrap "form-group" or "controls" wrappers.
   #
   config.wrappers :none, :tag => 'div', :error_class => 'error' do |b|
     b.use :html5
-- 
cgit v1.2.3


From 7574862cdb8f43e9e4334924dc360f3d20b2c5fd Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Sat, 26 Mar 2016 18:33:30 +0100
Subject: upgrade: horizontal forms now need column styles

---
 config/initializers/simple_form_bootstrap.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config/initializers')

diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb
index f693a4f..720174f 100644
--- a/config/initializers/simple_form_bootstrap.rb
+++ b/config/initializers/simple_form_bootstrap.rb
@@ -3,8 +3,8 @@ SimpleForm.setup do |config|
   config.wrappers :bootstrap, :tag => 'div', :class => 'form-group', :error_class => 'error' do |b|
     b.use :html5
     b.use :placeholder
-    b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |ba|
+    b.use :label, :class => 'col-sm-2'
+    b.wrapper :tag => 'div', :class => 'col-sm-10' do |ba|
       ba.use :input
       ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
       ba.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
-- 
cgit v1.2.3


From 306b36c045cd62638db179115ed002c6ab7c5cd8 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 22 Sep 2016 14:36:10 +0200
Subject: included Theas work on error-handling \o/; changed link to
 twitter-account in header; fixed erb escaping characters problem without
 letting evil code pass; setting customized image file 'Avatar_Pic.png' in
 config/custo../assets to get loaded instead of default twitter-logo

---
 config/initializers/assets.rb        |  1 +
 config/initializers/customization.rb |  3 ++-
 config/initializers/twitter.rb       | 37 ++++++++++++++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)
 create mode 100644 config/initializers/assets.rb
 create mode 100644 config/initializers/twitter.rb

(limited to 'config/initializers')

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
new file mode 100644
index 0000000..ccb32b6
--- /dev/null
+++ b/config/initializers/assets.rb
@@ -0,0 +1 @@
+Rails.application.config.assets.precompile += %w( Avatar_Pic.png )
diff --git a/config/initializers/customization.rb b/config/initializers/customization.rb
index 9f537e9..9b3a2b9 100644
--- a/config/initializers/customization.rb
+++ b/config/initializers/customization.rb
@@ -21,7 +21,8 @@ customization_directory = APP_CONFIG["customization_directory"]
 # * For this to work, config.assets.initialize_on_precompile MUST be set to true, otherwise
 #   this initializer will never get called in production mode when the assets are precompiled.
 #
-Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets"
+# Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets"
+Rails.application.config.assets.paths.unshift "#{customization_directory}/assets"
 
 #
 # Copy files to public
diff --git a/config/initializers/twitter.rb b/config/initializers/twitter.rb
new file mode 100644
index 0000000..9f537e9
--- /dev/null
+++ b/config/initializers/twitter.rb
@@ -0,0 +1,37 @@
+#
+# When deploying, common customizations can be dropped in config/customizations. This initializer makes this work.
+#
+APP_CONFIG["customization_directory"] ||= "#{Rails.root}/config/customization"
+customization_directory = APP_CONFIG["customization_directory"]
+
+#
+# Set customization views as the first view path
+#
+# Rails.application.config.paths['app/views'].unshift "config/customization/views"
+# (For some reason, this does not work here. See application.rb for where this is actually called.)
+
+#
+# Set customization stylesheets as the first asset path
+#
+# Some notes:
+#
+# * This cannot go in application.rb, as far as I can tell. In application.rb, the default paths
+#   haven't been loaded yet, so the path we add will always end up at the end unless we add it here.
+#
+# * For this to work, config.assets.initialize_on_precompile MUST be set to true, otherwise
+#   this initializer will never get called in production mode when the assets are precompiled.
+#
+Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets"
+
+#
+# Copy files to public
+#
+if !defined?(RAKE) && Dir.exist?("#{customization_directory}/public")
+  require 'fileutils'
+  FileUtils.cp_r("#{customization_directory}/public/.", "#{Rails.root}/public", :preserve => true)
+end
+
+#
+# Add I18n path
+#
+Rails.application.config.i18n.load_path += Dir["#{customization_directory}/locales/*.{rb,yml,yaml}"]
-- 
cgit v1.2.3


From 6f9c4fdab2caef90e49ca965617e767b50bcbbb2 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 22 Sep 2016 15:31:52 +0200
Subject: initializer/twitter.rb file unnecessary; added change in main view
 only if twitter feature is set enabled == true

---
 config/initializers/twitter.rb | 37 -------------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 config/initializers/twitter.rb

(limited to 'config/initializers')

diff --git a/config/initializers/twitter.rb b/config/initializers/twitter.rb
deleted file mode 100644
index 9f537e9..0000000
--- a/config/initializers/twitter.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# When deploying, common customizations can be dropped in config/customizations. This initializer makes this work.
-#
-APP_CONFIG["customization_directory"] ||= "#{Rails.root}/config/customization"
-customization_directory = APP_CONFIG["customization_directory"]
-
-#
-# Set customization views as the first view path
-#
-# Rails.application.config.paths['app/views'].unshift "config/customization/views"
-# (For some reason, this does not work here. See application.rb for where this is actually called.)
-
-#
-# Set customization stylesheets as the first asset path
-#
-# Some notes:
-#
-# * This cannot go in application.rb, as far as I can tell. In application.rb, the default paths
-#   haven't been loaded yet, so the path we add will always end up at the end unless we add it here.
-#
-# * For this to work, config.assets.initialize_on_precompile MUST be set to true, otherwise
-#   this initializer will never get called in production mode when the assets are precompiled.
-#
-Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets"
-
-#
-# Copy files to public
-#
-if !defined?(RAKE) && Dir.exist?("#{customization_directory}/public")
-  require 'fileutils'
-  FileUtils.cp_r("#{customization_directory}/public/.", "#{Rails.root}/public", :preserve => true)
-end
-
-#
-# Add I18n path
-#
-Rails.application.config.i18n.load_path += Dir["#{customization_directory}/locales/*.{rb,yml,yaml}"]
-- 
cgit v1.2.3


From 7c9aba4a6192617cd29765450711a65affccecef Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 22 Sep 2016 16:13:42 +0200
Subject: clean up

---
 config/initializers/customization.rb | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'config/initializers')

diff --git a/config/initializers/customization.rb b/config/initializers/customization.rb
index 9b3a2b9..a96564c 100644
--- a/config/initializers/customization.rb
+++ b/config/initializers/customization.rb
@@ -1,10 +1,8 @@
-#
 # When deploying, common customizations can be dropped in config/customizations. This initializer makes this work.
 #
 APP_CONFIG["customization_directory"] ||= "#{Rails.root}/config/customization"
 customization_directory = APP_CONFIG["customization_directory"]
 
-#
 # Set customization views as the first view path
 #
 # Rails.application.config.paths['app/views'].unshift "config/customization/views"
@@ -21,7 +19,6 @@ customization_directory = APP_CONFIG["customization_directory"]
 # * For this to work, config.assets.initialize_on_precompile MUST be set to true, otherwise
 #   this initializer will never get called in production mode when the assets are precompiled.
 #
-# Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets"
 Rails.application.config.assets.paths.unshift "#{customization_directory}/assets"
 
 #
-- 
cgit v1.2.3


From 4ffa776d2c760618b17bd76a9a023f7fe762babd Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 23 Sep 2016 11:52:46 +0200
Subject: Doc updated on how to customize avatar picture in twitter feature;
 update error response messages; added 'config/customization/images' + link in
 'config/initializer/customization.rb'

---
 config/initializers/customization.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config/initializers')

diff --git a/config/initializers/customization.rb b/config/initializers/customization.rb
index a96564c..6d9c741 100644
--- a/config/initializers/customization.rb
+++ b/config/initializers/customization.rb
@@ -19,8 +19,8 @@ customization_directory = APP_CONFIG["customization_directory"]
 # * For this to work, config.assets.initialize_on_precompile MUST be set to true, otherwise
 #   this initializer will never get called in production mode when the assets are precompiled.
 #
-Rails.application.config.assets.paths.unshift "#{customization_directory}/assets"
-
+Rails.application.config.assets.paths.unshift "#{customization_directory}/images"
+Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets"
 #
 # Copy files to public
 #
-- 
cgit v1.2.3