aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/environment.rb2
-rw-r--r--config/general.yml-example2
-rw-r--r--config/packages2
-rw-r--r--doc/CHANGES.md24
-rw-r--r--doc/INSTALL.md4
-rw-r--r--locale/cs/app.po14
-rw-r--r--locale/uk/app.po6
-rw-r--r--spec/controllers/application_controller_spec.rb22
8 files changed, 53 insertions, 23 deletions
diff --git a/config/environment.rb b/config/environment.rb
index a0b4a5eb6..492446a43 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -41,7 +41,7 @@ require File.join(File.dirname(__FILE__), '../lib/old_rubygems_patch')
require 'configuration'
# Application version
-ALAVETELI_VERSION = '0.6.7'
+ALAVETELI_VERSION = '0.6.8'
Rails::Initializer.run do |config|
# Load intial mySociety config
diff --git a/config/general.yml-example b/config/general.yml-example
index 1cceef38e..fd134b0c2 100644
--- a/config/general.yml-example
+++ b/config/general.yml-example
@@ -18,7 +18,7 @@ ISO_COUNTRY_CODE: GB
# This is the timezone that times and dates are displayed in
# If not set defaults to UTC.
-#TIME_ZONE: Australia/Sydney
+TIME_ZONE: Australia/Sydney
# These feeds are displayed accordingly on the Alaveteli "blog" page:
BLOG_FEED: 'http://www.mysociety.org/category/projects/whatdotheyknow/feed/'
diff --git a/config/packages b/config/packages
index 3cffcb0f9..ded8dc9a5 100644
--- a/config/packages
+++ b/config/packages
@@ -36,3 +36,5 @@ rubygems
rake
build-essential
bundler
+sqlite3
+libsqlite3-dev \ No newline at end of file
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
index d3faa101d..2fd26fcbe 100644
--- a/doc/CHANGES.md
+++ b/doc/CHANGES.md
@@ -1,3 +1,27 @@
+# Version 0.6.8
+## Highlighted features
+
+* Support for using Postfix as Alaveteli's MTA, instead of Exim (Matthew Landauer)
+* Some preparation for getting Alaveteli working with Ruby 1.9 (James McKinney) - more to come here in future releases!
+* Optional support for using New Relic for performance monitoring (Matthew Landauer)
+* Support for showing all dates and times in the local time zone (Matthew Landauer)
+* Display of authority disclosure logs where the URL is added (Matthew Landauer)
+* Better handling of nil/empty option config parameters (Henare Degan)
+* The option to specify a particular theme branch to use (Matthew Landauer)
+* Some performance improvements, particularly over 0.6.7 (Louise Crow)
+
+* [List of issues on github](https://github.com/mysociety/alaveteli/issues?milestone=24&state=closed)
+
+## Upgrade notes
+* Ensure you have values for new config variables (see `config/general.yml-example`):
+ * TIME_ZONE (if not set, defaults to UTC)
+ * TWITTER_WIDGET_ID (no Twitter widget is displayed if not set)
+ * THEME_BRANCH (defaults to tagged version specific to your version of alaveteli or, failing that, to master)
+ * MTA_LOG_PATH
+ * MTA_LOG_TYPE (defaults to Exim)
+* Copy config/newrelic.yml-example to config/newrelic.yml - by default monitoring is switched off, see https://github.com/newrelic/rpm for instructions on switching on local and remote performance analysis.
+* Check out this version and run `rails-post-deploy` as usual.
+* Note that mailcatcher is now used in development - see http://mailcatcher.me/ for details
# Version 0.6.7
## Highlighted features
* The ability to calculate due dates using calendar, not working days (Matthew Landauer)
diff --git a/doc/INSTALL.md b/doc/INSTALL.md
index e36d10e2b..761121139 100644
--- a/doc/INSTALL.md
+++ b/doc/INSTALL.md
@@ -164,6 +164,10 @@ emails. Full configuration for an MTA is beyond the scope of this
document, though we describe an example configuration for Exim in
`INSTALL-exim4.md`.
+Note that in development mode, mail is handled by default by mailcatcher
+so that you can see the mails in a browser - see http://mailcatcher.me/
+for more details.
+
## Minimal
If you just want to get the tests to pass, you will at a minimum need
diff --git a/locale/cs/app.po b/locale/cs/app.po
index 8019b7387..ae0e761cb 100644
--- a/locale/cs/app.po
+++ b/locale/cs/app.po
@@ -14,7 +14,7 @@ msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
"POT-Creation-Date: 2012-11-06 16:35+0000\n"
-"PO-Revision-Date: 2012-11-06 18:25+0000\n"
+"PO-Revision-Date: 2012-11-07 09:52+0000\n"
"Last-Translator: louisecrow <louise@mysociety.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -120,7 +120,7 @@ msgid ""
"\"Hello! We have an <a "
"href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important"
" message</a> for visitors outside {{country_name}}\""
-msgstr ""
+msgstr "\"Hello! We have an <a href=\\\"/help/alaveteli?country_name=#{CGI.escape(current_country)}\\\">important message</a> for visitors outside {{country_name}}\""
msgid "%d Freedom of Information request to %s"
msgid_plural "%d Freedom of Information requests to %s"
@@ -309,7 +309,7 @@ msgid ""
"<p>If you write about this request (for example in a forum or a blog) please"
" link to this page, and add an\\n annotation below telling people"
" about your writing.</p>"
-msgstr "Odesláno!\ndalší text viz e-mail od Hany z 29/9"
+msgstr "<p><strong>Odesláno!</strong></p>\n<p><strong>Pošleme vám e-mail </strong> až vám instituce odpoví nebo po {{late_number_of_days}} dní po vypršení lhůty na odpověď.</p>\\n <p>Pokud o tomto dotazu budete dále psát (například na nějakém fóru či blogu) prosím přiložte odkaz k vašemu dotazu na těchto stránkách a přidejte k němu komentář.</p>"
msgid ""
"<p>{{site_name}} is currently in maintenance. You can only view existing "
@@ -327,8 +327,8 @@ msgid "<span id='follow_count'>%d</span> person is following this authority"
msgid_plural ""
"<span id='follow_count'>%d</span> people are following this authority"
msgstr[0] "<span id='follow_count'>%d</span> člověk sleduje tuto instituci"
-msgstr[1] "'follow_count'>%d</span> lidí sledují tuto instituci"
-msgstr[2] "'follow_count'>%d</span> lidí sleduje tuto instituci"
+msgstr[1] "<span id='follow_count'>%d</span> lidí sledují tuto instituci"
+msgstr[2] "<span id='follow_count'>%d</span> lidí sleduje tuto instituci"
msgid ""
"<strong> Can I request information about myself?</strong>\\n\t\t\t<a "
@@ -3809,10 +3809,10 @@ msgid "{{number_of_comments}} comments"
msgstr "{{number_of_comments}} komentářů"
msgid "{{public_body_link}} answered a request about"
-msgstr ""
+msgstr "{{public_body_link}} zodpověděl dotaz týkající se"
msgid "{{public_body_link}} was sent a request about"
-msgstr ""
+msgstr "Na {{public_body_link}} byl odeslán dotaz"
msgid "{{public_body_name}} only:"
msgstr "Pouze {{public_body_name}}:"
diff --git a/locale/uk/app.po b/locale/uk/app.po
index c92aab0cc..60e59821b 100644
--- a/locale/uk/app.po
+++ b/locale/uk/app.po
@@ -10,8 +10,8 @@ msgstr ""
"Project-Id-Version: alaveteli\n"
"Report-Msgid-Bugs-To: http://github.com/sebbacon/alaveteli/issues\n"
"POT-Creation-Date: 2012-11-06 16:35+0000\n"
-"PO-Revision-Date: 2012-11-06 18:18+0000\n"
-"Last-Translator: louisecrow <louise@mysociety.org>\n"
+"PO-Revision-Date: 2012-11-08 12:11+0000\n"
+"Last-Translator: hiiri <murahoid@gmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -2376,7 +2376,7 @@ msgid ""
msgstr "Підкажіть, де автор запиту може знайти <strong>більше інформації</strong>."
msgid "Summary:"
-msgstr ""
+msgstr "Тема:"
msgid "Table of statuses"
msgstr "Таблиця статусів"
diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index a7e505376..18341ae6f 100644
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -2,41 +2,41 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
require 'fakeweb'
describe ApplicationController, "when accessing third party services" do
+
before (:each) do
FakeWeb.clean_registry
end
+
after (:each) do
FakeWeb.clean_registry
end
+
it "should succeed if the service responds OK" do
- config = MySociety::Config.load_default()
- config['GAZE_URL'] = 'http://denmark.com'
+ Configuration.stub!(:gaze_url).and_return('http://denmark.com')
FakeWeb.register_uri(:get, %r|denmark.com|, :body => "DK")
country = self.controller.send :country_from_ip
country.should == "DK"
end
it "should fail silently if the country_from_ip domain doesn't exist" do
- config = MySociety::Config.load_default()
- config['GAZE_URL'] = 'http://12123sdf14qsd.com'
+ Configuration.stub!(:gaze_url).and_return('http://12123sdf14qsd.com')
country = self.controller.send :country_from_ip
- country.should == config['ISO_COUNTRY_CODE']
+ country.should == Configuration.iso_country_code
end
it "should fail silently if the country_from_ip service doesn't exist" do
- config = MySociety::Config.load_default()
- config['GAZE_URL'] = 'http://www.google.com'
+ Configuration.stub!(:gaze_url).and_return('http://www.google.com')
country = self.controller.send :country_from_ip
- country.should == config['ISO_COUNTRY_CODE']
+ country.should == Configuration.iso_country_code
end
it "should fail silently if the country_from_ip service returns an error" do
FakeWeb.register_uri(:get, %r|500.com|, :body => "Error", :status => ["500", "Error"])
- config = MySociety::Config.load_default()
- config['GAZE_URL'] = 'http://500.com'
+ Configuration.stub!(:gaze_url).and_return('http://500.com')
country = self.controller.send :country_from_ip
- country.should == config['ISO_COUNTRY_CODE']
+ country.should == Configuration.iso_country_code
end
end
describe ApplicationController, "when caching fragments" do
+
it "should not fail with long filenames" do
long_name = "blahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblahblah.txt"
params = { :only_path => true,
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-30 16:57:54 +0000