| Commit message (Collapse) | Author | Age | Lines |
|
|
|
|
| |
These instructions are heavily based on those written by me and
@dracos for FixMyStreet and MapIt.
|
|
|
|
|
|
| |
The make-crontab script is now redundant, so instead direct
people to use the config_files:convert_crontab rake task for
generating a crontab file.
|
| |
|
| |
|
|
|
|
| |
'testing' is now jessie for debian - so be explicit that wheezy is the distribution we want to add.
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
Gemfile
app/views/admin_request/edit_outgoing.html.erb
config/packages
doc/CHANGES.md
doc/INSTALL.md
spec/models/info_request_spec.rb
spec/models/public_body_spec.rb
|
| | |
|
| |
| |
| |
| |
| | |
Precise is now the long term maintenance version, and has a more
up-to-date package of rubygems available.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Version 1.8.15 from backports should not have the Syck bug described
here:
http://stackoverflow.com/questions/9004804/invalid-gemspec-illformed-requirement-yamlsyckdefaultkey0xb5f9c990-3
http://blog.rubygems.org/2011/08/31/shaving-the-yaml-yak.html
|
| | |
|
| | |
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
admin.js was being generated from a view so that the config variable
ADMIN_PUBLIC_URL could be used to direct AJAX requests in the admin
interface correctly. ADMIN_PUBLIC_URL was necessary for
WhatDoTheyKnow when the admin interface was proxied over SSL, while
the rest of the site was non-SSL. Now that the whole site is served
over SSL, however, the proxy for the admin interface is not longer
used and ADMIN_PUBLIC_URL / ADMIN_BASE_URL have been removed.
As a result, admin.js is now being generated from a Rails view
unnecessarily, and at some performance cost. This commit moves
admin.coffee and admin.js to the public directory, so they will
be served more efficiently.
In addition, this commit removes admin.coffee / admin.js from
public/javascripts/ where there was a second (and different) version
that now appears to be unused.
|
|/ / |
|
| | |
|
| | |
|
| | |
|
|\ \
| |/
|/| |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
in 9452a2e5fffd35be383250ada139b349a5866acb as it causes ajax requests to be refused in the new request process.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
|\ \ |
|
| | |
| | |
| | |
| | | |
These were written by Henare Degan with some changes by Mark Longair.
|
|/ / |
|
| |
| |
| |
| | |
reinstated in subsequent merge.
|
|\ \
| | |
| | |
| | | |
ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The httpd.conf file needs to be customized before being
deployed, and in mySociety's deploy system, a custom version
is only looked for if a corresponding -example file exists.
Also change httpd.conf to httpd.conf-example in INSTALL.md
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
Gemfile.lock
app/controllers/public_body_controller.rb
app/mailers/track_mailer.rb
app/views/request/_hidden_correspondence.html.erb
app/views/request/_sidebar.html.erb
app/views/request/hidden.html.erb
app/views/request/new_please_describe.html.erb
app/views/request/preview.html.erb
app/views/user/show.html.erb
config/environment.rb
config/routes.rb
spec/controllers/public_body_controller_spec.rb
|
| | |
|
| |
| |
| |
| |
| |
| |
| | |
When running a script in another directory via a relative
path it's not necessary to have a leading ./ regardless of
your PATH. (At least that's is the case with bash, zsh,
tcsh, csh and dash.)
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Instead we should use "bundle exec rails plugin". The
"-r rails-3" is to make sure that we get the Rails 3 version
of the theme, i.e. one that uses Rails.root instead of
RAILS_ROOT. (Unfortunately, it doesn't work specifying an
annotated tag with "-r", so we use a branch name instead,
say, of "use-alaveteli-0.10".)
|
|\|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
Gemfile
Gemfile.lock
app/views/admin_request/show.html.erb
config/environment.rb
|
| | |
|
| | |
|
| | |
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
Gemfile
Gemfile.lock
doc/INSTALL.md
|
| | |
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
Gemfile
Gemfile.lock
app/controllers/admin_request_controller.rb
app/controllers/admin_track_controller.rb
app/controllers/request_controller.rb
app/controllers/services_controller.rb
app/helpers/link_to_helper.rb
app/mailers/request_mailer.rb
app/models/application_mailer.rb
app/models/info_request.rb
app/views/admin_censor_rule/edit.html.erb
app/views/admin_censor_rule/new.html.erb
app/views/admin_public_body/_form.html.erb
app/views/admin_public_body/_locale_selector.html.erb
app/views/admin_public_body/_one_list.html.erb
app/views/admin_public_body/edit.html.erb
app/views/admin_public_body/list.html.erb
app/views/admin_public_body/new.html.erb
app/views/admin_request/_incoming_message_actions.html.erb
app/views/admin_request/edit.html.erb
app/views/admin_request/edit_comment.html.erb
app/views/admin_request/edit_outgoing.html.erb
app/views/admin_request/list.html.erb
app/views/admin_request/list_old_unclassified.html.erb
app/views/admin_request/show.html.erb
app/views/admin_track/_some_tracks.html.erb
app/views/admin_track/list.html.erb
app/views/admin_user/edit.html.erb
app/views/admin_user/list.html.erb
app/views/admin_user/show.html.erb
app/views/general/_footer.html.erb
app/views/general/exception_caught.html.erb
app/views/help/contact.html.erb
app/views/layouts/default.html.erb
app/views/public_body/_alphabet.html.erb
app/views/request/_request_listing_single.html.erb
app/views/request/_sidebar.html.erb
app/views/request/new.html.erb
app/views/request/show.html.erb
app/views/request_mailer/external_response.rhtml
app/views/request_mailer/fake_response.rhtml
config/environment.rb
config/environments/production.rb
config/routes.rb
spec/controllers/admin_censor_rule_controller_spec.rb
spec/controllers/request_controller_spec.rb
spec/controllers/track_controller_spec.rb
spec/helpers/link_to_helper_spec.rb
spec/mailers/request_mailer_spec.rb
spec/models/info_request_spec.rb
spec/spec_helper.rb
spec/views/public_body/show.html.erb_spec.rb
spec/views/request/show.html.erb_spec.rb
vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
|
| |\
| | |
| | |
| | |
| | | |
Conflicts:
Gemfile.lock
|
| | |
| | |
| | |
| | | |
by Varnish
|