Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
| | * | | | Merge branch 'hotfix/0.7.0.4' | Louise Crow | 2013-03-14 | -1951/+1977 | |
| | |\ \ \ | |||||
| | | * | | | Latest translations from transifex.hotfix/0.7.0.4 | Louise Crow | 2013-03-14 | -1951/+1977 | |
| | |/ / / | |||||
* | | | | | Fix another order dependent test issue | Matthew Landauer | 2013-03-19 | -0/+4 | |
| | | | | | |||||
* | | | | | Fix view for admin create authority. Block form of helper needs to return value | Matthew Landauer | 2013-03-19 | -3/+2 | |
| | | | | | |||||
* | | | | | Make search ahead pagination link to the right place. Fixes #860 | Matthew Landauer | 2013-03-19 | -1/+1 | |
| | | | | | |||||
* | | | | | Another order dependent test issue fixed | Matthew Landauer | 2013-03-19 | -0/+2 | |
| | | | | | |||||
* | | | | | Rails security update | Matthew Landauer | 2013-03-19 | -100/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | The rails upgrade also forces a mail gem upgrade. To make things work again we need to remove part of the monkeypatched backporting of encoding fixes. | ||||
* | | | | | Stop AlaveteliConfiguration class being loaded twice | Matthew Landauer | 2013-03-19 | -4/+0 | |
| | | | | | |||||
* | | | | | Stop pollution of params[:outgoing_message] | Matthew Landauer | 2013-03-19 | -4/+1 | |
| | | | | | |||||
* | | | | | Merge branch 'develop' into rails-3-develop | Matthew Landauer | 2013-03-19 | -2242/+5931 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock doc/INSTALL.md | ||||
| * | | | | Move Gemfile to https | Louise Crow | 2013-03-14 | -2/+2 | |
| | | | | | |||||
| * | | | | Update to specific commit in webrat for launchy fix without other breaking ↵ | Louise Crow | 2013-03-14 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | changes. | ||||
| * | | | | And now latest version of launchy. | Louise Crow | 2013-03-14 | -4/+3 | |
| | | | | | |||||
| * | | | | Pull more up-to-date version of webrat from git - trying to resolve travis ↵ | Louise Crow | 2013-03-14 | -8/+13 | |
| | | | | | | | | | | | | | | | | | | | | issues with launchy dependency. | ||||
| * | | | | Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117e | Louise Crow | 2013-03-14 | -3/+3 | |
| | | | | | |||||
| * | | | | Downgrade launchy to avoid deprecation warning. | Louise Crow | 2013-03-14 | -5/+6 | |
| | |/ / | |/| | | |||||
| * | | | New strings for translation. | Louise Crow | 2013-03-14 | -333/+3983 | |
| | | | | |||||
| * | | | Cleanup whitespace. | Louise Crow | 2013-03-14 | -57/+57 | |
| | | | | |||||
| * | | | Latest translations from Transifex. | Louise Crow | 2013-03-14 | -1951/+1977 | |
| | | | | |||||
| * | | | Try adding launchy as a gem - webrat seems to have a dependency on it. | Louise Crow | 2013-03-13 | -0/+5 | |
| | | | | |||||
| * | | | Consistent syntax for X-Forwarded-Proto | Louise Crow | 2013-03-13 | -23/+23 | |
| | | | | |||||
* | | | | Now randomise the test order by default to help uncover order dependent issues | Matthew Landauer | 2013-03-19 | -1/+1 | |
| | | | | |||||
* | | | | Remove test of rails internals that is somehow interfering with other tests | Matthew Landauer | 2013-03-19 | -4/+0 | |
| | | | | |||||
* | | | | Deal with further side effects of stuff done outside of a transaction in tests | Matthew Landauer | 2013-03-19 | -0/+2 | |
| | | | | |||||
* | | | | bundle update debugger rmagick | Matthew Landauer | 2013-03-18 | -31/+30 | |
| | | | | |||||
* | | | | Correct URLs in example file | Henare Degan | 2013-03-16 | -2/+2 | |
| | | | | |||||
* | | | | This is already the default | Henare Degan | 2013-03-16 | -5/+0 | |
| | | | | |||||
* | | | | This no longer requires iconv in Ruby 1.9 | Henare Degan | 2013-03-16 | -7/+0 | |
| | | | | |||||
* | | | | We don't need test unit any more because we're not using RSpec 1.x | Henare Degan | 2013-03-16 | -6/+0 | |
| | | | | | | | | | | | | | | | | Also fixes last issue related to tests expecting no output #820 | ||||
* | | | | This won't work anymore so remove it | Henare Degan | 2013-03-16 | -8/+0 | |
| | | | | |||||
* | | | | Replace use of Iconv in Ruby 1.9 to get rid of deprecation warnings | Henare Degan | 2013-03-16 | -7/+23 | |
| | | | | |||||
* | | | | Fix syntax to reinstate link to annotation | Henare Degan | 2013-03-16 | -1/+1 | |
| | | | | |||||
* | | | | Add info_request_id attribute back so AJAX know which request to ask for | Henare Degan | 2013-03-16 | -1/+1 | |
| | | | | |||||
* | | | | Fix syntax to reinstate link to outgoing message | Henare Degan | 2013-03-16 | -1/+1 | |
| | | | | |||||
* | | | | autospec wasn't working so remove until someone complains. Closes #824 | Henare Degan | 2013-03-16 | -6/+0 | |
| | | | | |||||
* | | | | Reenable test now that we don't do HTML validation in the test suite | Henare Degan | 2013-03-16 | -9/+6 | |
| | | | | |||||
* | | | | Fix request categorisation links post merge | Henare Degan | 2013-03-16 | -1/+1 | |
| | | | | |||||
* | | | | Since we have 3 languages in test the URL should be prefixed with the locale | Henare Degan | 2013-03-16 | -2/+2 | |
| | | | | |||||
* | | | | The PUT method is also(?) used so revert this | Henare Degan | 2013-03-16 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Revert "POST became enforced in fa624fc7f17b6b4b6710817ed63291386e525f9c" This reverts commit 210fad894c3bb2b462001a42d33f6941c4ba38bb. | ||||
* | | | | Fix syntax for calling helper post merge | Henare Degan | 2013-03-15 | -1/+1 | |
| | | | | |||||
* | | | | Ignore the webrat log file | Henare Degan | 2013-03-15 | -0/+1 | |
| | | | | |||||
* | | | | admin_url was removed in 902631ec4f5e1a16b8f08a2ed0ccc86ad2b72c6c | Henare Degan | 2013-03-15 | -26/+0 | |
| | | | | |||||
* | | | | We've added a new fixture since the last merge | Henare Degan | 2013-03-15 | -3/+6 | |
| | | | | |||||
* | | | | Use a real example instead of a helper | Henare Degan | 2013-03-15 | -1/+1 | |
| | | | | |||||
* | | | | Fix up syntax from the Rails 3 merge | Henare Degan | 2013-03-15 | -4/+4 | |
| | | | | |||||
* | | | | Fix named route conflict originally done in ↵ | Henare Degan | 2013-03-15 | -1/+1 | |
| | | | | | | | | | | | | | | | | 889bb7b79f16533be7c8f2c46c9463b770a25dde | ||||
* | | | | Config name change missed in the merge | Henare Degan | 2013-03-15 | -2/+2 | |
| | | | | |||||
* | | | | Fix describe_state_message from the merge | Henare Degan | 2013-03-15 | -1/+2 | |
| | | | | |||||
* | | | | POST became enforced in fa624fc7f17b6b4b6710817ed63291386e525f9c | Henare Degan | 2013-03-15 | -1/+1 | |
| | | | | |||||
* | | | | These routes were renamed in 64fe099163e8b786e6c05fe05fe9cbb8c068e380 | Henare Degan | 2013-03-15 | -3/+3 | |
| | | | |