diff --git a/CHANGELOG b/CHANGELOG index c593c2d1123..70adf6d6a80 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -20,6 +20,7 @@ v1.6.1 - 2018-01-14 * Remove duplicated code in Addresses.vue file * Fix reminders not being sent in some cases * Fix avatars not being displayed in an activity on the journal +* Fix filtering of contacts by tags not taking into account the selected tag from the profile page RELEASED VERSIONS: diff --git a/CONTRIBUTORS b/CONTRIBUTORS index e60f281ca09..3670abdf683 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,5 +1,5 @@ This is the list of all the people that make this great software. -Add yourself at the botom of the list if you do contribute and wish +Add yourself at the bottom of the list if you do contribute and wish to appear as a contributor. At the very minimum, the GitHub username is required if you do wish to appear. Other fields are optional. @@ -28,3 +28,4 @@ Kovah @kovah Alexis Saettler @asbiin Steven Maguire @stevenmaguire @erdmenchen +Tom Rochette @tomzx diff --git a/resources/assets/js/tags.js b/resources/assets/js/tags.js index f0a90e39e7f..ab4668b495d 100644 --- a/resources/assets/js/tags.js +++ b/resources/assets/js/tags.js @@ -50,7 +50,7 @@ $('#tagsForm').submit(function(e) { // add the new tag for (var i = 0; i < data['tags'].length ; i++) { - $('.tags-list').append('
  • ' + data.tags[i].slug + '
  • '); + $('.tags-list').append('
  • ' + data.tags[i].slug + '
  • '); } $('.tags').toggle(); diff --git a/resources/views/people/_header.blade.php b/resources/views/people/_header.blade.php index e7988e00753..ba44be49abd 100644 --- a/resources/views/people/_header.blade.php +++ b/resources/views/people/_header.blade.php @@ -63,7 +63,7 @@