taiga
/
taiga-front
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'mikaoelitiana-fix-4220'

stable
David Barragán Merino 2016-06-09 20:07:55 +02:00
parent 1dfd01835f 73c7ae23ad
commit 6b43d7f4f3
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.rst
View File

@ -26,6 +26,7 @@ answer newbie questions, and generally made Taiga that much better:
- Guilhem Got <guilhem.got@gmail.com> - Guilhem Got <guilhem.got@gmail.com>
- Jordan Rinke - Jordan Rinke
- Miguel de la Cruz <miguel.delacruz@kaleidos.net> - Miguel de la Cruz <miguel.delacruz@kaleidos.net>
- Mika Andrianarijaona <mikaoelitiana@gmail.com>
- Pilar Esteban <pilar.esteban@gmail.com> - Pilar Esteban <pilar.esteban@gmail.com>
- Ramiro Sánchez <ramiro.sanzhez@kaleidos.net> - Ramiro Sánchez <ramiro.sanzhez@kaleidos.net>
- Ryan Swanstrom - Ryan Swanstrom

1
CHANGELOG.md
View File

@ -9,6 +9,7 @@
- Errors (not found, server error, permissions and blocked project) don't change the current url. - Errors (not found, server error, permissions and blocked project) don't change the current url.
- Attachments image slider - Attachments image slider
- New admin area to edit the tag colors used in your project - New admin area to edit the tag colors used in your project
- Display the current user (me) at first in assignment lightbox (thanks to [@mikaoelitiana](https://github.com/mikaoelitiana))
### Misc ### Misc
- Lots of small and not so small bugfixes. - Lots of small and not so small bugfixes.

1
app/coffee/modules/common/lightboxes.coffee
View File

@ -527,6 +527,7 @@ AssignedToLightboxDirective = (lightboxService, lightboxKeyboardNavigationServic
render = (selected, text) -> render = (selected, text) ->
users = _.clone($scope.activeUsers, true) users = _.clone($scope.activeUsers, true)
users = _.reject(users, {"id": selected.id}) if selected? users = _.reject(users, {"id": selected.id}) if selected?
users = _.sortBy(users, (o) -> if o.id is $scope.user.id then 0 else o.id)
users = _.filter(users, _.partial(filterUsers, text)) if text? users = _.filter(users, _.partial(filterUsers, text)) if text?
ctx = { ctx = {