| Commit message (Collapse) | Author | Age | Lines |
|---|
| |
|
|
|
|
| |
Looks like 'follower_count && follower_count > 0' was being interpreted as the argument to defined?, resulting in a return value of 'expression'.
Closes #2082
|
| | |
|
| |\
| |
| |
| |
| | |
Conflicts:
spec/factories.rb
|
| | |
| |
| |
| |
| | |
These notices are complete sentences, not composed on the fly, so should
be easier to translate.
|
| |/
|
|
| |
The InfoRequest is always the one associated with the event.
|
| |
|
|
|
| |
They're not finding by the existing object, they're finding an existing
object.
|
| |
|
|
|
| |
In render calls, that's now deprecated in favour of using the :formats
option.
|
| | |
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
.rhtml is deprecated in favour of .erb in Rails 3
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| |
| |
| | |
*everything* with rails_xss
|
| |\|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
Gemfile
Gemfile.lock
app/views/request/_hidden_correspondence.rhtml
app/views/request/hidden.rhtml
app/views/request/new_please_describe.rhtml
app/views/user/show.rhtml
lib/i18n_fixes.rb
|
| | | |
|
| |/ |
|
| | |
|
| |
|
|
| |
with @RichardTaylor
|
| | |
|
| | |
|
| |
|
|
|
|
| |
* 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
|
| |\
| |
| |
| | |
conflicts
|
| | | |
|
| |/
|
|
| |
"follow" rather than "track" in line with the current lingo. Fixes #150
|
| | |
|
| | |
|
| |
|
|
| |
haven't described yet.
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
Style track links in sidebar or main results differently.
|
| | |
|
| |
|
|
|
|
|
| |
people can use the raw RSS feeds now. This means the way RSS and email alerts
are handled is like on other sites, so people will hopefully understand it :)
We'll add comments to put back the social stuff we'd hoped having tracks
private would gain...
|
| |
|
|
|
| |
well as original requests.
Add RSS autodetection.
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
query but different type.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
