Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
3 changes: 2 additions & 1 deletion CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -28,3 +28,4 @@ Kovah @kovah <[email protected]>
Alexis Saettler @asbiin <[email protected]>
Steven Maguire @stevenmaguire <[email protected]>
@erdmenchen
Tom Rochette @tomzx <[email protected]>
2 changes: 1 addition & 1 deletion resources/assets/js/tags.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ $('#tagsForm').submit(function(e) {

// add the new tag
for (var i = 0; i < data['tags'].length ; i++) {
$('.tags-list').append('<li class="pretty-tag"><a href="/people?tags=' + data.tags[i].slug + '">' + data.tags[i].slug + '</a></li>');
$('.tags-list').append('<li class="pretty-tag"><a href="/people?tag1=' + data.tags[i].slug + '">' + data.tags[i].slug + '</a></li>');
}

$('.tags').toggle();
Expand Down
2 changes: 1 addition & 1 deletion resources/views/people/_header.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<ul class="tags">
<ul class="tags-list">
@foreach ($contact->tags as $tag)
<li class="pretty-tag"><a href="/people?tags={{ $tag->name_slug }}">{{ $tag->name }}</a></li>
<li class="pretty-tag"><a href="/people?tag1={{ $tag->name_slug }}">{{ $tag->name }}</a></li>
@endforeach
</ul>
<li><a href="#" id="showTagForm">{{ trans('people.tag_edit') }}</a></li>
Expand Down