diff options
| author | utvk <utvk@users.noreply.github.com> | 2017-02-11 12:33:06 +0100 |
|---|---|---|
| committer | utvk <utvk@users.noreply.github.com> | 2017-02-11 12:33:06 +0100 |
| commit | 2404cabeddb33870c3919838c4f1542cc3d8a559 (patch) | |
| tree | a3f000ef9439cad1ef26a6ebab4ec2bde5937292 /lib | |
| parent | 5ed5c70cfb3ed7ba2cece7229388a52a15479a77 (diff) | |
merge changes upstream
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/alavetelitheme.rb | 1 | ||||
| -rw-r--r-- | lib/config/custom-routes.rb | 1 | ||||
| -rw-r--r-- | lib/controller_patches.rb | 1 | ||||
| -rw-r--r-- | lib/customstates.rb | 1 | ||||
| -rw-r--r-- | lib/model_patches.rb | 5 | ||||
| -rw-r--r-- | lib/patch_mailer_paths.rb | 1 | ||||
| -rw-r--r-- | lib/tasks/alavetelitheme_tasks.rake | 1 |
7 files changed, 11 insertions, 0 deletions
diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb index c245617..668d92a 100644 --- a/lib/alavetelitheme.rb +++ b/lib/alavetelitheme.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- theme_name = File.split(File.expand_path("../..", __FILE__))[1] theme_name.gsub!('-', '_') THEME_NAME = theme_name diff --git a/lib/config/custom-routes.rb b/lib/config/custom-routes.rb index 6d4cda4..98fccf7 100644 --- a/lib/config/custom-routes.rb +++ b/lib/config/custom-routes.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # Here you can override or add to the pages in the core website Rails.application.routes.draw do diff --git a/lib/controller_patches.rb b/lib/controller_patches.rb index 5c48e70..6d796b0 100644 --- a/lib/controller_patches.rb +++ b/lib/controller_patches.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # Add a callback - to be executed before each request in development, # and at startup in production - to patch existing app classes. # Doing so in init/environment.rb wouldn't work in development, since diff --git a/lib/customstates.rb b/lib/customstates.rb index d801c92..323a105 100644 --- a/lib/customstates.rb +++ b/lib/customstates.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # See `http://alaveteli.org/docs/customising/themes/#customising-the-request-states` # for more explanation of this file diff --git a/lib/model_patches.rb b/lib/model_patches.rb index a4ca42e..4993c37 100644 --- a/lib/model_patches.rb +++ b/lib/model_patches.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # Add a callback - to be executed before each request in development, # and at startup in production - to patch existing app classes. # Doing so in init/environment.rb wouldn't work in development, since @@ -10,6 +11,10 @@ Rails.configuration.to_prepare do # OutgoingMessage.class_eval do # # Add intro paragraph to new request template # def default_letter + # # this line allows the default_letter text added by this + # # method to be replaced by the value supplied by the API + # # e.g. http://demo.alaveteli.org/new/tgq?default_letter=this+is+a+test + # return @default_letter if @default_letter # return nil if self.message_type == 'followup' # "If you uncomment this line, this text will appear as default text in every message" # end diff --git a/lib/patch_mailer_paths.rb b/lib/patch_mailer_paths.rb index 99da10a..4533be0 100644 --- a/lib/patch_mailer_paths.rb +++ b/lib/patch_mailer_paths.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # Add a callback - to be executed before each request in development, # and at startup in production - to patch existing app classes. # See http://stackoverflow.com/questions/7072758/plugin-not-reloading-in-development-mode diff --git a/lib/tasks/alavetelitheme_tasks.rake b/lib/tasks/alavetelitheme_tasks.rake index 1f1925b..3744d04 100644 --- a/lib/tasks/alavetelitheme_tasks.rake +++ b/lib/tasks/alavetelitheme_tasks.rake @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # desc "Explaining what the task does" # task :alavetelitheme do # # Task goes here |