nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5488 from Faldrian/5240-fix_async_searchresults_blueprint

Browse source 
Set refresh_search async searchresults load to use bootstrap
Fix #5240
This commit is contained in:
Dennis Schubert 2014-12-20 04:52:36 +01:00
commit 7b0cff3250
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -104,6 +104,7 @@ This is disabled by default since it requires the installation of additional pac
* Fix code overflow in SPV and improve styling for code tags [#5422](https://github.com/diaspora/diaspora/pull/5422)
* Correctly validate if local recipients actually want to receive a conversation [#5449](https://github.com/diaspora/diaspora/pull/5449)
* Improve consistency of poll answer ordering [#5471](https://github.com/diaspora/diaspora/pull/5471)
* Fix broken aspect selectbox on asynchronous search results [#5488](https://github.com/diaspora/diaspora/pull/5488)
## Features
* Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)

2
app/controllers/people_controller.rb
View file

@ -7,7 +7,7 @@ class PeopleController < ApplicationController
before_action :find_person, only: [:show, :stream, :hovercard]
layout ->(c){ request.format == :mobile ? "application" : "with_header_with_footer" }
use_bootstrap_for :index, :show, :contacts
use_bootstrap_for :index, :show, :contacts, :refresh_search
respond_to :html, :except => [:tag_index]
respond_to :json, :only => [:index, :show]