aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'vagrant_debian' of github.com:sebbacon/alaveteli into ↵vagrant_debianSeb Bacon2012-04-17-6/+6
|\ | | | | | | | | | | | | vagrant_debian Conflicts: doc/INSTALL-vagrant.md
| * Merge pull request #466 from henare/bundle-exec-docsSeb Bacon2012-04-06-17/+20
| |\ | | | | | | Update docs to run commands under bundle exec
| | * Update doco to run commands under 'bundle exec' now we're using bundlerHenare Degan2012-04-03-8/+8
| | |
* | | Ignore bundled bin/ contentsSeb Bacon2012-04-17-1/+2
| | |
* | | Correct path for rakeSeb Bacon2012-04-17-1/+1
| | |
* | | Mention requirement to use "bundle exec" in upgrade notesSeb Bacon2012-04-17-1/+6
| | |
* | | Minor documentation corrections and improvementsSeb Bacon2012-04-17-32/+30
| | |
* | | Update scripts and documentation to use `bundle exec` where appropriateSeb Bacon2012-04-17-21/+24
| | |
* | | Work around race condition when setting short_name and name. Fixes #474Seb Bacon2012-04-17-1/+11
| | |
* | | Sort the list of status so we can test its output more reliablySeb Bacon2012-04-16-1/+1
| | |
* | | Merge branch 'develop' into vagrant_debianSeb Bacon2012-04-15-46/+72
|\ \ \ | |_|/ |/| |
| * | Merge pull request #464 from jpmckinney/small-fixesRobin Houston2012-04-03-20/+20
| |\ \ | | | | | | | | Small fixes
| | * | use Rails.root, not RAILS_ROOTJames McKinney2012-04-02-20/+20
| | | |
| * | | Merge pull request #459 from henare/fix-docoRobin Houston2012-04-03-7/+8
| |\ \ \ | | | | | | | | | | Fix doco
| | * | | Correct constant nameHenare Degan2012-04-02-1/+1
| | | | |
| | * | | Reorder the wording so that it's clear before you do this step (just tripped ↵Henare Degan2012-04-02-5/+6
| | | | | | | | | | | | | | | | | | | | me up)
| | * | | Fix typo in linkHenare Degan2012-04-02-1/+1
| | | | |
| * | | | Merge pull request #463 from mhl/tiny-zip-test-fixRobin Houston2012-04-02-0/+1
| |\ \ \ \ | | | | | | | | | | | | One-line fix for a misleading test failure
| | * | | | Remove cache/zips/ before running tests that write to thereMark Longair2012-04-02-0/+1
| |/ / / /
| * | | | Merge pull request #462 from jpmckinney/small-fixesRobin Houston2012-04-02-0/+2
| |\ \ \ \ | | | |/ / | | |/| | Small fixes
| | * | | add a config.ru so that rack servers can run alaveteli more seamlesslyJames McKinney2012-04-02-0/+2
| | | | |
| | * | | tmp directory should be availableJames McKinney2012-04-02-0/+0
| | |/ /
| * / / Add a caveatRobin Houston2012-04-02-1/+5
| |/ / | | | | | | | | | | | | Add a caveat about update-exim4.conf that bit someone during the installfest at AlaveteliCon.
| * | Fixes to integration/admin_specRobin Houston2012-03-20-2/+1
| | | | | | | | | | | | | | | | | | 1. Remove useless call to spec_helper’s basic_auth_login method 2. Use Base64.encode64, rather than b64encode which also prints the encoded string to standard output.
| * | Merge branch 'wdtk' into developRobin Houston2012-03-20-18/+37
| |\ \
| | * | Fix the "log in as" functionRobin Houston2012-03-20-14/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the "log in as" function after 3b6e5a692b852a88f55b21a7210f60a6f7cfc24b would attempt to log the admin user out before issuing the redirect. Unfortunately this approach does not work on WhatDoTheyKnow, where the admin pages are served via a different domain (secure.mysociety.org) and so do not share session information with the rest of the site. This commit changes it to mark the PostRedirect with circumstance == "login_as", which signals the user controller to log out the previous user even if they are an admin. In other words, the user is logged out on the main site rather than the admin site, skirting this problem. Closes #450.
| | * | No code changesRobin Houston2012-03-13-3/+5
| | | | | | | | | | | | | | | | Just trailing whitespace & one comment.
| | * | Admin users clicking confirmation linksRobin Houston2012-03-13-2/+53
| | | | | | | | | | | | | | | | Fixes #446. See issue for details.
| | * | Only trailing whitespaceRobin Houston2012-02-16-1/+1
| | | |
| | * | Add SURVEY_URL and SURVEY_SECRET to general.yml-exampleRobin Houston2012-02-16-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | In the wdtk branch *ONLY* because the deployment system likes the example file to define the same variables as the actual config file.
| | * | Tweak the custom routes mechanismRobin Houston2012-02-16-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It didn’t seem to work before. (?) Note that this requires a change to the code as e.g. in https://github.com/sebbacon/alavetelitheme/blob/master/lib/config/custom-routes.rb because the route configuration code should not be inside a Dispatcher.to_prepare block now.
* | | | Use bundle exec (even with bundle install, eugh) with all commands so the ↵Henare Degan2012-04-03-3/+3
| | | | | | | | | | | | | | | | xapian-full gem isn't rebuilt each time
* | | | Set $HOME so bundler looks into the right place for its cacheHenare Degan2012-04-03-9/+12
| |_|/ |/| |
* | | Update docs to reflect latest chef/vagrant setupSeb Bacon2012-03-16-32/+25
| | |
* | | Don't bother setting max_fsm_pages -- it's deprecated and will break in ↵Seb Bacon2012-03-16-7/+0
| | | | | | | | | | | | newer postgres
* | | latest lockfileSeb Bacon2012-03-16-11/+12
| | |
* | | Don't assume `make` et al are present.Seb Bacon2012-03-16-1/+1
| | |
* | | More fiddles to make it install correctly on a different Debian base VMSeb Bacon2012-03-16-16/+17
| | |
* | | Chef won't follow symlinksSeb Bacon2012-03-16-1/+144
| | |
* | | You have to install from a git repository if you want bundler to compile ↵Seb Bacon2012-03-16-36/+2
| | | | | | | | | | | | the extension. If you install from a local gem, it won't compile. Why?!
* | | More fixes (install bundler correctly; add rake and bundler to the PATH)Seb Bacon2012-03-15-144/+32
| | |
* | | run commands that don't require root privs as correct effective userSeb Bacon2012-03-15-0/+3
| | |
* | | Default to SUDO_USER if presentSeb Bacon2012-03-15-2/+2
| | |
* | | Provision more stuff with chef (not particularly smartly, mind...).Seb Bacon2012-03-15-19/+205
| | |
* | | Merge branch 'develop' into vagrant_debianSeb Bacon2012-03-14-187522/+47149
|\| | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore config/packages doc/INSTALL.md
| * | Merge branch 'develop' of github.com:sebbacon/alaveteli into developSeb Bacon2012-03-13-10/+61
| |\ \
| | * | Fix broken testRobin Houston2012-03-13-5/+5
| | | |
| | * | Correct bad nestingRobin Houston2012-03-13-3/+2
| | | |
| | * | Avoid "uninitialized constant Rake::DSL" errorRobin Houston2012-03-13-0/+1
| | | | | | | | | | | | | | | | See http://stackoverflow.com/a/6686628/424991
| | * | Admin users clicking confirmation linksRobin Houston2012-03-13-2/+53
| | | | | | | | | | | | | | | | Fixes #446. See issue for details.