Commit message (Collapse) | Author | Age | Lines | ||
---|---|---|---|---|---|
... | |||||
| * | | | | | Merge branch 'translation-script' into rails-3-develop | Louise Crow | 2015-03-23 | -1/+46 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | Add rake task for uppdating locale files with slightly changed msgids | Louise Crow | 2015-03-23 | -1/+46 | |
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | We don't really want to make all the translators retranslate strings that are basically the same but slightly tweaked in the English version. So this task just replaces the msgid in the app.po files for each locale. | ||||
| * | | | | Merge remote-tracking branch ↵ | Gareth Rees | 2015-03-20 | -729/+2065 | |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | 'origin/2140-translations-failed-validation-r3d' into rails-3-develop | ||||
| | * | | | Make sure fields with errors are highlighted in the default locale. | Louise Crow | 2015-03-18 | -0/+12 | |
| | | | | | |||||
| | * | | | Highlight fields with errors in the admin interface. | Louise Crow | 2015-03-18 | -0/+8 | |
| | | | | | |||||
| | * | | | Fix translating Public Body Headings | Gareth Rees | 2015-03-18 | -184/+683 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Fixes submission of form containing both existing and new translations | ||||
| | * | | | Fix translating Public Body Categories | Gareth Rees | 2015-03-18 | -207/+886 | |
| | | | | | |||||
| | * | | | Fix translating Public Bodies | Gareth Rees | 2015-03-18 | -338/+476 | |
| |/ / / | |||||
| * | | | Merge branch 'schlos-patch-1' into rails-3-develop | Gareth Rees | 2015-03-18 | -1/+1 | |
| |\ \ \ | |||||
| | * | | | Update Croatian language | Miroslav | 2015-03-17 | -1/+1 | |
| |/ / / | | | | | | | | | Just updating to first caps to match GUI context | ||||
| * | | | Merge branch '2163-deploy-restart-daemon' into rails-3-develop | Gareth Rees | 2015-03-17 | -6/+24 | |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Add deploy daemon_name upgrade notes | Gareth Rees | 2015-03-09 | -0/+7 | |
| | | | | |||||
| | * | | Improve checking whether the daemon can run | Gareth Rees | 2015-03-09 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only `su` to the app user if the app user is not running the script. If the app user is running the script, its unlikely they'll have sudo permissions so the `su` call prompts for a password. | ||||
| | * | | Create daemons with correct permissions | Gareth Rees | 2015-03-09 | -3/+5 | |
| | | | | | | | | | | | | | | | | | | | | The app user needs to be able to restart the app because of the current capistrano setup. The deploy user should not really be the app runner. | ||||
| | * | | Restart alaveteli by service command | Gareth Rees | 2015-03-09 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | - daemon_name defaults to "alaveteli" - daemon_name can be set per-environment in config/deploy.yml | ||||
| * | | | Remove migration script. | Louise Crow | 2015-03-13 | -4/+0 | |
| |/ / | | | | | | | | | | Other code for this data migration was removed in e6511423e9334973ecd8d808c3b73c1b4e312935. | ||||
| * | | Merge branch '2165-compact-xapian-restart' into rails-3-develop | Gareth Rees | 2015-03-09 | -5/+8 | |
| |\ \ | |||||
| | * | | Add compact Xapian crontab upgrade notes | Gareth Rees | 2015-03-09 | -0/+5 | |
| | | | | |||||
| | * | | Add optional daemon_name parameter | Gareth Rees | 2015-03-09 | -2/+3 | |
| | | | | | | | | | | | | | | | | For hosts with multiple alaveteli services | ||||
| | * | | Restart alaveteli rather than apache | Gareth Rees | 2015-03-09 | -5/+2 | |
| |/ / | |||||
| * | | Merge branch 'vagrant-performance' into rails-3-develop | Gareth Rees | 2015-03-09 | -0/+11 | |
| |\ \ | |||||
| | * | | Give VirtualBox access to all host CPU cores | Gareth Rees | 2015-02-16 | -0/+11 | |
| | | | | | | | | | | | | | | | | via https://stefanwrobel.com/how-to-make-vagrant-performance-not-suck | ||||
| * | | | Merge branch 'add_pry' into rails-3-develop | Gareth Rees | 2015-03-09 | -0/+9 | |
| |\ \ \ | |||||
| | * | | | Add pry to development gems | Gareth Rees | 2015-02-10 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pry is awesome. The main reason to add it to the Gemfile is to use `binding.pry` in views and controllers. TL;DR is that it halts execution and opens a REPL for you to dig around at the current variables at the point of the binding. See Railscast #280 [1] for a quick overview. 0.9 seems to be the last version to support Ruby 1.8 [1] http://railscasts.com/episodes/280-pry-with-rails | ||||
| * | | | | Merge branch '59-localised-authority-links' into rails-3-develop | Louise Crow | 2015-03-05 | -138/+120 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/public_body/show.html.erb | ||||
| | * | | | | Use routing helper to generate localised urls. | Louise Crow | 2015-03-05 | -99/+120 | |
| | | | | | | |||||
| | * | | | | Remove 'html' param. | Louise Crow | 2015-03-05 | -51/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's only one call to this function in the rest of the code. That has 'html' set to true. | ||||
| * | | | | | Merge branch '2178-improve-batch-sent-notice' into rails-3-develop | Louise Crow | 2015-03-05 | -17/+56 | |
| |\ \ \ \ \ | |||||
| | * | | | | | Use new styling for batch request sent panel. | Louise Crow | 2015-03-03 | -15/+54 | |
| | | | | | | | |||||
| | * | | | | | Make notice about override work with batch requests. | Louise Crow | 2015-03-03 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | They don't have a public body, so use the config param directly. | ||||
| * | | | | | | Merge branch 'remove-public-body-categories' into rails-3-develop | Louise Crow | 2015-03-05 | -158/+0 | |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Remove deprecated code. Fixes #2015. | Louise Crow | 2015-02-26 | -158/+0 | |
| | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Add some more detailed release notes. | Louise Crow | 2015-03-03 | -14/+43 | |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Exclude .bundle from coverage reports. | Louise Crow | 2015-03-02 | -0/+1 | |
| | | | | | | |||||
| * | | | | | Restore text from 0870c537bdd910091b604e0e0c1f90b7ea57ac06. | Louise Crow | 2015-03-02 | -1/+2 | |
| | | | | | | |||||
| * | | | | | Merge branch 'issues/1526-redesign-make-request-process' into rails-3-develop | Louise Crow | 2015-03-02 | -442/+811 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Remove duplicate notes field. | Louise Crow | 2015-03-02 | -3/+1 | |
| | | | | | | |||||
| | * | | | | Make unsubscribe a button as it is elsewhere on this page. | Louise Crow | 2015-03-02 | -6/+6 | |
| | | | | | | |||||
| | * | | | | Align buttons and follower count. | Louise Crow | 2015-03-02 | -1/+0 | |
| | | | | | | |||||
| | * | | | | Make request extract full width when on authority page. | Louise Crow | 2015-03-02 | -0/+4 | |
| | | | | | | |||||
| | * | | | | Don't display stepwise_make_request unless there's some content for it. | Louise Crow | 2015-03-02 | -1/+3 | |
| | | | | | | |||||
| | * | | | | Add some side margin to the notes content | Louise Crow | 2015-03-02 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Don't want it right by the border of stepwise_make_request. | ||||
| | * | | | | Add bottom margin to stepwise_make_request | Louise Crow | 2015-03-02 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Next element shouldn't be right along its border. | ||||
| | * | | | | Don't show two 'Make a request' buttons if there's no contact info. | Louise Crow | 2015-03-02 | -2/+2 | |
| | | | | | | |||||
| | * | | | | Fixed display of process complete page in non-responsive mode | Martin Wright | 2015-03-02 | -0/+4 | |
| | | | | | | |||||
| | * | | | | Fixed display of sign in/up page in non-responsive mode | Martin Wright | 2015-03-02 | -8/+21 | |
| | | | | | | |||||
| | * | | | | Fixed display of write request page in non-responsive mode | Martin Wright | 2015-03-02 | -19/+24 | |
| | | | | | | |||||
| | * | | | | Fixed display of public body page when running non-responsive mode | Martin Wright | 2015-03-02 | -31/+97 | |
| | | | | | | |||||
| | * | | | | repaired some errors introduced with merge | Martin Wright | 2015-03-02 | -19/+18 | |
| | | | | | | |||||
| | * | | | | tidy up after merge added missing </div> | Martin Wright | 2015-03-02 | -27/+20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | remove duplicate request button |