aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| | | | * | | | | | | Fix incorrect count for heading childrenGareth Rees2014-11-20-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was initially counting the number of headings rather than the number of categories inside each heading.
| | | | * | | | | | | Tidy public body category management UIGareth Rees2014-11-20-36/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the forms for editing categories and category headings more uniform with other admin pages - Put the dangerous actions in a well - Remove large well for returning to the index page
| | | * | | | | | | | Merge branch '1905-prep-for-full-version-string' into rails-3-developGareth Rees2014-11-20-0/+2
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Support the full four-point version stringGareth Rees2014-11-19-0/+2
| | | |/ / / / / / /
| | * | | | | | | | Merge branch 'close-update-public-body' into rails-3-developLouise Crow2014-11-27-0/+3
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Adds button missing from 921ee9a19c267bb0e6e784091b985f3ba80d835bLouise Crow2014-11-18-0/+3
| | | | |_|_|_|/ / | | | |/| | | | |
| | * | | | | | | Merge branch 'issues/1969-inconsistent-public-body-admin-interface' into ↵Gareth Rees2014-11-19-52/+54
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rails-3-develop
| | | * | | | | | | Remove restricton on deleting PublicBodyHeadings with associated ↵lizconlan2014-11-19-31/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PublicBodyCategories
| | | * | | | | | | Fix view bug preventing PublicBodyCategories being deleted in the admin ↵lizconlan2014-11-19-21/+27
| | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | interface
| | * | | | | | | Merge branch '1962-category-dropdowns' into rails-3-developGareth Rees2014-11-19-3/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | Use badge to show number of categories in headingGareth Rees2014-11-18-3/+6
| | | | |_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The chevron didn't illustrate that the heading had any category children. The app uses the badge pattern elsewhere. Adds minor style improvements: - Pad erb tags - Use each instead of for Fixes https://github.com/mysociety/alaveteli/issues/1962
| | * | | | | | | Merge branch '1970-remove-load-categories-stub' into rails-3-developGareth Rees2014-11-19-5/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Remove stubs of removed methodGareth Rees2014-11-18-5/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PublicBodyCategory#load_categories no longer exists, so don't try to stub it. Fixes https://github.com/mysociety/alaveteli/issues/1970
| | * | | | | | Merge branch '1968-disable-category-tag-field' into rails-3-developGareth Rees2014-11-18-9/+16
| | |\ \ \ \ \ \
| | | * | | | | | Disable rather than hide form fields that can’t be modifiedGareth Rees2014-11-17-9/+16
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not clear to the user why the form field is sometimes present and sometimes not present. The Category tag field may only be modified if authorities have not yet been assigned to the Category. This commit explains this and disables the field if this is true.
| | * | | | | | Merge branch '1977-update-categories-redirect-to-edit' into rails-3-developGareth Rees2014-11-18-10/+82
| | |\ \ \ \ \ \
| | | * | | | | | Use flash[:error] for error conditionGareth Rees2014-11-18-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also use double quotes rather than string escaping
| | | * | | | | | Add specs to cover unsuccessful creationGareth Rees2014-11-17-1/+12
| | | | | | | | |
| | | * | | | | | Add coverage to ensure ‘new’ templates are renderedGareth Rees2014-11-17-0/+11
| | | | | | | | |
| | | * | | | | | Add expectation to #index specGareth Rees2014-11-17-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The spec that covers AdminPublicBodyCategoriesController#index did not have an expectation
| | | * | | | | | Redirect to #edit after updatingGareth Rees2014-11-17-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On an unsuccessful update AdminPublicBodyHeadingsController and AdminPublicBodyCategoriesController #update should render the #edit action.
| | | * | | | | | Redirect to #edit after updatingGareth Rees2014-11-17-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a successful update AdminPublicBodyHeadingsController and AdminPublicBodyCategoriesController #update should redirect to the #edit action rather than simply rendering the ‘edit’ template. Fixes https://github.com/mysociety/alaveteli/issues/1977
| | | * | | | | | Provide expectations for controller specsGareth Rees2014-11-17-4/+17
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This commit adds expectations to AdminPublicBodyCategoriesController and AdminPublicBodyHeadingsController edit actions
| * | | | | | | Emphasise public body categories upgrade stepGareth Rees2014-11-18-1/+1
| | | | | | | |
| * | | | | | | Update CHANGELOG (Version 0.20)Gareth Rees2014-11-18-1/+51
| |/ / / / / /
| * | | | | | Update translationsGareth Rees2014-11-18-718/+7548
| | | | | | |
| * | | | | | Clean translationsGareth Rees2014-11-18-50/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleans translations added in df11360
| * | | | | | Update translationsGareth Rees2014-11-18-246/+256
| | | | | | |
| * | | | | | Update newrelic_rpmGareth Rees2014-11-18-1/+1
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'hotfix/0.19.0.10' into rails-3-developLouise Crow2014-11-17-26/+26
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix missing translation introduced in 962357cGareth Rees2014-11-12-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 962357c tidied the translation but left the translation call (`_()`) around the variable rather than the string literal.
| * | | | | Revert text changes in bf31b10Gareth Rees2014-11-12-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further work on redesigning the request process [1] will reword these lines, so don't make the translators do work for no gain. [1] https://github.com/mysociety/alaveteli/issues/1526
| * | | | | Revert text changes in 8a21f27Gareth Rees2014-11-12-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Further work on redesigning the request process [1] will reword these lines, so don't make the translators do work for no gain. [1] https://github.com/mysociety/alaveteli/issues/1526
| * | | | Merge branch '1433-admin-bottom-margin' into rails-3-developGareth Rees2014-11-11-1/+1
| |\ \ \ \
| | * | | | Add margin to bottom of admin viewsGareth Rees2014-11-05-1/+1
| | | |/ / | | |/| | | | | | | Prevents the pagination being squashed up against the window edge
| * | | | Merge branch 'rails-3-develop' of ↵Louise Crow2014-11-10-103/+14055
| |\ \ \ \ | | | | | | | | | | | | | | | | | | ssh://git.mysociety.org/data/git/public/alaveteli into rails-3-develop
| | * \ \ \ Merge branch '1663-split-select-authority-page' into rails-3-developGareth Rees2014-11-10-101/+71
| | |\ \ \ \
| | | * | | | Move “Can’t find an authority” to sidebarGareth Rees2014-10-30-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the “Can’t find an authority” actions on the /select_authority page to the right of the search results
| | | * | | | Improve /select_authority search boxGareth Rees2014-10-30-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make it wider - Add a placeholder - Translate placeholder and title text
| | | * | | | Tidy up request/select_authority.html.erbGareth Rees2014-10-30-23/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Align indentation - Use named path for form url - Use %Q() to avoid string escaping - Use :anchor option to link to help page section - Use symbols for form tag names
| | | * | | | Remove authority preview from /select_authorityGareth Rees2014-10-30-88/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clicking a search result now takes the user directly to the authority show page. Removes the step numbers from the headers as the show page interrupts the flow and seems pointless to add workarounds in public_body/show just for this.
| | * | | | | Merge branch 'issues/1437-apple-mail-attachment-parsing' into rails-3-developGareth Rees2014-11-10-2/+13970
| | |\ \ \ \ \
| | | * | | | | Add fix for Apple Mail with attachments Gareth Rees2014-11-04-2/+13825
| | | | | | | |
| | | * | | | | Add some specs to MailBackendGareth Rees2014-11-04-0/+145
| | | | |/ / / | | | |/| | |
| | * | | | | Merge branch 'help_page_redirect' into rails-3-developGareth Rees2014-11-10-0/+14
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Redirect /help to /help/aboutGareth Rees2014-11-05-0/+14
| | |/ / / / | | | | | | | | | | | | | | | | | | Shouldn't really 404 on an important/accessible URL
| * | | | | Merge branch 'update-compass-rails-conservatively' into rails-3-developLouise Crow2014-11-10-11/+16
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Upgrade compass-rails to version 2.0.0Louise Crow2014-11-07-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.0.1 depends on sass 3.3.13 (as described here), which causes segfaults under ruby 1.8.7 on asset precompilation.
| | * | | | Use mysociety's version of ruby-msg.Louise Crow2014-11-06-6/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A temporary measure until https://github.com/aquasync/ruby-msg/pull/10 can be merged. ruby-msg and sass (>=3.3) both define their own versions of OrderedHash (sass only uses its version under Ruby 1.8.7) and they conflict.
| * | | | Merge branch 'hotfix/0.19.0.9' into rails-3-developLouise Crow2014-10-31-478/+4347
| |\ \ \ \ | | | |_|/ | | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-25 16:35:55 +0000