aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Merge branch 'feature/less-destructive-themes-install' into rails-3-developLouise Crow2013-12-09-59/+79
|\
| * Merge branch 'feature/less-destructive-themes-install' of ssh://git.mysociety...Louise Crow2013-12-09-59/+79
|/|
| * Make 'rake themes:install' safer for developersMark Longair2013-12-06-59/+79
* | Merge branch 'document-pdf-fix' into rails-3-developMark Longair2013-12-09-1/+117
|\ \
| * | Treat any document/pdf attachment as if it were application/pdfMark Longair2013-12-03-1/+117
* | | Merge branch 'fix-command-line-csv' into rails-3-developMark Longair2013-12-09-10/+41
|\ \ \
| * | | Fix the command-line CSV importer under Ruby 1.9Mark Longair2013-12-03-10/+41
* | | | Merge branch 'feature/asset-fixes' into rails-3-developMark Longair2013-12-09-2/+2
|\ \ \ \
| * | | | Remove link to the now-removed theme.cssMark Longair2013-12-05-1/+0
| * | | | Fix the link to the fancybox CSSMark Longair2013-12-05-1/+2
| | |_|/ | |/| |
* | | | Merge branch 'feature/fix-fake-response' into rails-3-developMark Longair2013-12-09-1/+23
|\ \ \ \
| * | | | Use a better subject line than "Fake Response" for uploaded responsesMark Longair2013-12-06-1/+23
| |/ / /
* | | | Revert "Add byebug, for interactive debugging under Ruby 2"Mark Longair2013-12-09-5/+0
* | | | Merge remote-tracking branch 'openaustralia_github/consistent-admin-links' in...Louise Crow2013-12-09-2/+2
|\ \ \ \
| * | | | Make admin link order consistentHenare Degan2013-12-07-2/+2
| |/ / /
* / / / Correct small typo in README.mdGuy Freeman2013-12-09-1/+1
|/ / /
* | | Merge remote-tracking branch 'origin/feature/cleaner-attachment-image-path' i...Mark Longair2013-12-05-1/+1
|\ \ \
| * | | Slightly nicer and more robust path reference.Louise Crow2013-12-03-1/+1
* | | | Merge remote-tracking branch 'openaustralia/ruby-2' into rails-3-developMark Longair2013-12-05-11/+38
|\ \ \ \
| * | | | Specify a build as rbenv doesn't fuzzy match versions (Thanks to @mhl)Henare Degan2013-11-26-1/+1
| * | | | Fix quietly_try_to_purge on Ruby 2.0Mark Longair2013-11-22-9/+30
| * | | | Add byebug, for interactive debugging under Ruby 2Mark Longair2013-11-22-0/+5
| * | | | Get Travis building against Ruby 2.0Henare Degan2013-11-15-0/+1
| * | | | Set default development version to Ruby 2.0Henare Degan2013-11-15-1/+1
| * | | | `bundle update vpim` for Ruby 2.0 supportHenare Degan2013-11-15-1/+1
* | | | | Merge branch 'feature/switch-theme-none-option' into rails-3-developMark Longair2013-12-05-8/+17
|\ \ \ \ \
| * | | | | Update the switch-theme.rb script allow switching to no themeMark Longair2013-11-25-8/+17
* | | | | | Update INSTALL.md to say that Alaveteli won't run in a EC2 Micro instanceMark Longair2013-12-05-5/+4
* | | | | | Fix label.Louise Crow2013-12-04-1/+1
* | | | | | Add some instructions on removing the symlinking code.Louise Crow2013-12-04-0/+5
* | | | | | Merge remote-tracking branch 'origin/restore-xapian-rake-tasks' into rails-3-...Louise Crow2013-12-04-1/+3
|\ \ \ \ \ \
| * | | | | | Use Rails.root in the RakefileMark Longair2013-12-03-2/+2
| * | | | | | Add back the acts_as_xapian Rake tasksMark Longair2013-12-03-0/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Set enforce_available_locales to false.Louise Crow2013-12-04-0/+1
* | | | | | Upgrade Rails to 3.2.16 to get fixes for CVE-2013-6414, CVE-2013-4491, CVE-20...Louise Crow2013-12-04-29/+29
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'rails-3-develop' of ssh://git.mysociety.org/data/git/public/ala...Louise Crow2013-12-03-9/+19
|\| | | |
| * | | | Merge branch 'theme-install-fixes' into rails-3-developMark Longair2013-12-03-9/+19
| |\ \ \ \
| | * | | | Try to uninstall the old theme from vendor/plugins and lib/themesMark Longair2013-12-03-8/+17
| | * | | | Precompile assets only for production.Louise Crow2013-12-03-1/+4
| | * | | | Ensure that the lib/themes directory exists before installing to thereMark Longair2013-12-03-0/+1
| | | |_|/ | | |/| |
* | | | | Merge branch 'feature/1201-close-attachment-files-after-read' into rails-3-de...Louise Crow2013-12-03-2/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use a block to automatically close file.Louise Crow2013-11-12-1/+1
| | |_|/ | |/| |
* | | | Only precompile assets on non-staging sites.Louise Crow2013-12-03-0/+3
* | | | Ignore db/structure.sqlLouise Crow2013-12-03-0/+1
| |/ / |/| |
* | | Merge branch 'move-plugins-out-of-vendor-plugins' into rails-3-developMark Longair2013-12-03-42/+57
|\ \ \
| * | | Revert "Silence deprecation warnings."Mark Longair2013-12-03-3/+0
| * | | Move themes from vendor/plugins to lib/themesMark Longair2013-12-03-7/+10
| * | | Update the acts_as_xapian generator to work under Rails 3Mark Longair2013-11-29-11/+8
| * | | Move the acts_as_xapian generator into lib/generatorsMark Longair2013-11-29-0/+0
| * | | Move acts_as_xapian out of vendor/pluginsMark Longair2013-11-29-14/+31
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 19:16:11 +0000