| Commit message (Collapse) | Author | Age | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
main project
|
|\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
Gemfile
Gemfile.lock
app/controllers/general_controller.rb
app/controllers/track_controller.rb
app/models/outgoing_message.rb
app/models/public_body.rb
app/models/user.rb
app/views/general/frontpage.rhtml
config/environment.rb
config/initializers/inflections.rb
config/initializers/mime_types.rb
db/migrate/094_remove_old_tags_foreign_key.rb
lib/timezone_fixes.rb
spec/models/request_mailer_spec.rb
spec/views/request/list.rhtml_spec.rb
|
| |
| |
| |
| | |
browsers that support it - with image backgrounds, we get tied up in issues about the line-height of input elements, which FF sets using !important. Fixes https://github.com/mysociety/whatdotheyknow-theme/issues/53
|
| | |
|
| | |
|
|/ |
|
|
|
|
| |
overriden by themes.
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
* Change "email me about stuff" wording to "follow" throughout
* Introduce a new flag that the user can set, which controls if they get email alerts
* Add a new link to a "wall" for logged in users where they can see a feed of all the things they're following
|
|
|
|
|
|
| |
new "needs admin attention"-type state to InfoRequests, a flag indicating that a request has ever been marked as needing admin attention, and a controller method and route for setting this state & flag. Also adds the reason something needs admin attention to the subject of the email that gets sent to administrators.
Neeeds tests.
|
| |
|
|
|
|
| |
deploy it or not while it's still immature
|
|
|
|
|
|
|
| |
Includes a couple of additional fixes:
* Remember to HTML-quote things that could come from users
* Fix form post action for editing users
|
|
|
|
|
|
| |
webfont (for benefit of Hungarian users); also `chmod -x` the permissions."
This reverts commit 213b8e825a0b94e47eb3c7ca2011c340816fce73.
|
|
|
|
| |
Fixes:#425
|
|
|
|
| |
`chmod -x` the permissions.
|
| |
|
| |
|
| |
|
|
|
|
| |
http://cl.ly/2w3B2u3o2T1d3u2a0p1o
|
| |
|
| |
|
|\ |
|
| | |
|
| | |
|
|/ |
|
|
|
|
|
| |
- There is no such thing as “cursor: hand;”
- Opacity is not measured in pixels.
|
|\ |
|
| |
| |
| |
| | |
Note that #everypage is not used by default.
|
|/ |
|
| |
|
|
|
|
| |
sizes relative, improve contrast of text). Fixes #348
|
| |
|
| |
|
|
|
|
|
| |
The width needs to be fixed on the authority page, but not on the authority
preview, so use a more specific CSS rule for the latter
|