aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/admin_general
Commit message (Collapse)AuthorAgeLines
* Merge branch 'restful-admin-routes' into rails-3-developLouise Crow2014-12-18-12/+12
|\
| * RESTful routing for admin track actionsLouise Crow2014-12-18-1/+1
| |
| * Use RESTful routes for CRUD admin user actionsLouise Crow2014-12-18-1/+1
| |
| * Move change request actions to use RESTful routes.Louise Crow2014-12-18-4/+4
| |
| * Move edit and update to RESTful routingLouise Crow2014-12-18-1/+1
| |
| * Move new action to use RESTful routing.Louise Crow2014-12-18-1/+1
| |
| * Use RESTful routing for indexLouise Crow2014-12-18-1/+1
| |
| * Make show_raw_email a RESTful action via GETLouise Crow2014-12-12-2/+2
| | | | | | | | | | Move specs that involve receiving email and then viewing the interface to be integration specs, which is what they really are.
| * Use RESTful routing for index and show actionsLouise Crow2014-12-12-1/+1
| |
* | Add holidays admin linkLouise Crow2014-12-15-2/+8
|/ | | | Use dropdown to group related authority pages.
* Remove unused "web analytics" section of admin pages - it's confusing!Henare Degan2014-12-09-5/+0
|
* Adds button missing from 921ee9a19c267bb0e6e784091b985f3ba80d835bLouise Crow2014-11-18-0/+3
|
* Merge branch 'issues/1457-close-change-request-without-email' into ↵Louise Crow2014-10-30-2/+6
|\ | | | | | | rails-3-develop
| * Allow closure of a change request without sending an email.Louise Crow2014-10-30-2/+6
| |
* | fixup! Use RESTful routing.Louise Crow2014-10-09-1/+1
| |
* | Use RESTful routing.Louise Crow2014-09-26-1/+1
| |
* | Basic category admin screenlizconlan2014-09-22-0/+1
|/
* Since e5a73815 excerpt requires a hash for optionsGareth Rees2014-08-12-1/+1
| | | | | | HighlightHelper#excerpt backports the Rails 4 excerpt which requires a Hash for the options parameter rather than globbing the remaining arguments.
* Add change requests to the 'Things to do' listLouise Crow2014-01-13-1/+91
|
* Merge branch 'feature/hide-individual-responses' into rails-3-developLouise Crow2013-09-17-2/+2
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile app/views/admin_request/edit_outgoing.html.erb config/packages doc/CHANGES.md doc/INSTALL.md spec/models/info_request_spec.rb spec/models/public_body_spec.rb
| * Add public criteria for message event access methodsLouise Crow2013-09-16-1/+1
| | | | | | | | | | | | | | get_last_response_event and get_last_outgoing_event are used in various places to determine which events to link to, use in queries etc. Restrict them to refer to the last publicly visible event of the relevant type, and rename them to make that clear.
| * Remove prominence.Louise Crow2013-09-16-1/+1
| | | | | | | | | | | | | | Add a migration to remove the unused column 'prominence' from info_request_events, remove validation of prominence, remove unused InfoRequestEvent.user_can_view? method. Remove references to InfoRequestEvent.prominence.
* | Serve admin.js as a static fileMark Longair2013-08-21-90/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | admin.js was being generated from a view so that the config variable ADMIN_PUBLIC_URL could be used to direct AJAX requests in the admin interface correctly. ADMIN_PUBLIC_URL was necessary for WhatDoTheyKnow when the admin interface was proxied over SSL, while the rest of the site was non-SSL. Now that the whole site is served over SSL, however, the proxy for the admin interface is not longer used and ADMIN_PUBLIC_URL / ADMIN_BASE_URL have been removed. As a result, admin.js is now being generated from a Rails view unnecessarily, and at some performance cost. This commit moves admin.coffee and admin.js to the public directory, so they will be served more efficiently. In addition, this commit removes admin.coffee / admin.js from public/javascripts/ where there was a second (and different) version that now appears to be unused.
* | Handle case of nil user_idLouise Crow2013-08-20-1/+1
|/ | | | When status was updated by a script.
* Merge branch 'develop' into rails-3-developLouise Crow2013-03-19-3/+5
|\ | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/views/admin_request/show.html.erb config/environment.rb
| * Supply info request id in an HTML 5 data attributerelease/0.8Louise Crow2013-03-19-3/+5
| |
| * Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117eLouise Crow2013-03-14-3/+3
| |
* | Merge branch 'develop' into rails-3-developMatthew Landauer2013-03-19-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock doc/INSTALL.md
| * | Fix bad merge of d88b79d1aa24a78ed95255a37a0403d7e3c0117eLouise Crow2013-03-14-3/+3
| |/
* | Merge remote-tracking branch 'mysociety/develop' into rails-3-developHenare Degan2013-03-14-154/+369
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Gemfile Gemfile.lock app/controllers/admin_request_controller.rb app/controllers/admin_track_controller.rb app/controllers/request_controller.rb app/controllers/services_controller.rb app/helpers/link_to_helper.rb app/mailers/request_mailer.rb app/models/application_mailer.rb app/models/info_request.rb app/views/admin_censor_rule/edit.html.erb app/views/admin_censor_rule/new.html.erb app/views/admin_public_body/_form.html.erb app/views/admin_public_body/_locale_selector.html.erb app/views/admin_public_body/_one_list.html.erb app/views/admin_public_body/edit.html.erb app/views/admin_public_body/list.html.erb app/views/admin_public_body/new.html.erb app/views/admin_request/_incoming_message_actions.html.erb app/views/admin_request/edit.html.erb app/views/admin_request/edit_comment.html.erb app/views/admin_request/edit_outgoing.html.erb app/views/admin_request/list.html.erb app/views/admin_request/list_old_unclassified.html.erb app/views/admin_request/show.html.erb app/views/admin_track/_some_tracks.html.erb app/views/admin_track/list.html.erb app/views/admin_user/edit.html.erb app/views/admin_user/list.html.erb app/views/admin_user/show.html.erb app/views/general/_footer.html.erb app/views/general/exception_caught.html.erb app/views/help/contact.html.erb app/views/layouts/default.html.erb app/views/public_body/_alphabet.html.erb app/views/request/_request_listing_single.html.erb app/views/request/_sidebar.html.erb app/views/request/new.html.erb app/views/request/show.html.erb app/views/request_mailer/external_response.rhtml app/views/request_mailer/fake_response.rhtml config/environment.rb config/environments/production.rb config/routes.rb spec/controllers/admin_censor_rule_controller_spec.rb spec/controllers/request_controller_spec.rb spec/controllers/track_controller_spec.rb spec/helpers/link_to_helper_spec.rb spec/mailers/request_mailer_spec.rb spec/models/info_request_spec.rb spec/spec_helper.rb spec/views/public_body/show.html.erb_spec.rb spec/views/request/show.html.erb_spec.rb vendor/plugins/rails_xss/lib/rails_xss/erubis.rb
| * Merge remote-tracking branch ↵Louise Crow2013-03-11-21/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/make_ui_for_links_in_admin_interface_consistent' into develop Conflicts: app/views/admin_censor_rule/new.rhtml app/views/admin_general/index.rhtml app/views/admin_general/timeline.rhtml app/views/admin_request/_some_requests.rhtml app/views/admin_request/show.rhtml app/views/admin_track/_some_tracks.rhtml
| | * Use helpers for iconsMatthew Landauer2013-03-08-6/+6
| | |
| | * Configuration::admin_public_url doesn't exist anymoreMatthew Landauer2013-03-08-3/+3
| | |
| | * Update admin timeline with new consistent link formatMatthew Landauer2013-03-08-4/+2
| | |
| | * Use new standard form of links on home page of adminMatthew Landauer2013-03-08-10/+5
| | |
| | * Use normal link for admin interface and eye icon for main siteMatthew Landauer2013-03-08-2/+2
| | |
| * | Merge remote-tracking branch ↵Louise Crow2013-03-11-8/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/use_url_helpers_in_admin_links' into develop Conflicts: app/views/admin_request/_incoming_message_actions.rhtml app/views/admin_request/show.rhtml
| | * | Replace a few instances of <a> tags with link_toMatthew Landauer2013-03-08-6/+6
| | | |
| | * | In admin interface use url helpers instead of hardcoded urlsMatthew Landauer2013-03-08-2/+2
| | | |
| * | | Merge remote-tracking branch 'openaustralia_github/html5' into developLouise Crow2013-03-08-3/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: app/views/admin_general/index.rhtml app/views/admin_request/show.rhtml
| | * | Make url in link actually be something sensibleMatthew Landauer2013-03-07-1/+1
| | | |
| | * | Fix html5 validation errorsMatthew Landauer2013-03-07-2/+2
| | |/
| * | Merge remote-tracking branch ↵Louise Crow2013-03-08-3/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'openaustralia_github/feature_more_info_guessed_requests_in_holding_pen' into develop Conflicts: app/views/admin_general/_admin_navbar.rhtml app/views/admin_general/admin.coffee app/views/admin_general/admin.js app/views/admin_general/admin_js.erb app/views/admin_general/index.rhtml app/views/admin_general/stats.rhtml app/views/admin_general/timeline.rhtml app/views/admin_public_body/_one_list.rhtml app/views/admin_public_body/_tags.rhtml app/views/admin_public_body/show.rhtml app/views/admin_request/_some_requests.rhtml app/views/admin_request/show.rhtml app/views/admin_track/_some_tracks.rhtml app/views/admin_track/list.rhtml app/views/admin_user/_user_table.rhtml app/views/admin_user/show.rhtml
| | * | Move serving of js for admin interface from general to admin_general controllerMatthew Landauer2013-02-25-0/+88
| | | |
| | * | Merge in adminbootstraptheme 323d704ab4f1ffe31f20fcabeaf030c462dfbadf into ↵Matthew Landauer2013-02-25-152/+288
| | | | | | | | | | | | | | | | main project
| * | | Use relative paths.Louise Crow2013-03-06-1/+1
| | | |
| * | | Use relative pathsLouise Crow2013-03-06-5/+5
| | | |
| * | | Remove support for admin proxy setup.Louise Crow2013-03-06-3/+3
| | |/ | |/|
| * | Merge remote-tracking branch 'openaustralia_github/make-links-relative' into ↵Louise Crow2013-03-06-28/+29
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop Conflicts: app/controllers/admin_request_controller.rb app/models/request_mailer.rb app/views/admin_general/index.rhtml app/views/admin_general/stats.rhtml app/views/admin_public_body/_one_list.rhtml app/views/admin_public_body/_tags.rhtml app/views/admin_public_body/show.rhtml app/views/admin_request/show.rhtml app/views/admin_user/show.rhtml app/views/layouts/admin.rhtml app/views/public_body/show.rhtml app/views/request/new.rhtml
| | * | Make internal links relativeMatthew Landauer2013-02-15-1/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-09 03:57:25 +0000