Public

Project privacy set to public. By default, its content is available to everyone (authenticated or not). Please note that more restrictive permissions might exist on some items.

stable

Clone or download

Read-only

Merge commit 'refs/changes/48/2748/9' of ssh://gerrit.tuleap.net:29418/tuleap into stable

Download Browse

* ssh://gerrit.tuleap.net:29418/tuleap: request #7303: Ability to easily reference a user (@mentions) Return avatar of user in REST API

+161 −64
Nicolas Terray (nterray) 2014-08-05 14:16
Nicolas Terray (nterray) 2014-08-05 14:16
40bb0357ea76be285a9a974ef861219d7ec5f521
git #tuleap/stable/40bb0357ea76be285a9a974ef861219d7ec5f521

Modified Files

Side by side diff
Inline diff
Name
M .gitignore +1 −0 Go to diff View file
M plugins/tracker/include/Tracker/Artifact/View/Edit.class.php +1 −1 Go to diff View file
M plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_String.class.php +3 −3 Go to diff View file
M plugins/tracker/include/Tracker/FormElement/Tracker_FormElement_Field_Text.class.php +3 −3 Go to diff View file
M plugins/tracker/templates/artifact-modal.mustache +1 −1 Go to diff View file
M plugins/tracker/www/scripts/TrackerArtifact.js +3 −1 Go to diff View file
M plugins/tracker/www/scripts/modal-in-place.js +1 −0 Go to diff View file
M src/common/include/Combined.class.php +4 −1 Go to diff View file
M src/common/layout/Layout.class.php +1 −0 Go to diff View file
M src/common/user/REST/UserRepresentation.class.php +12 −6 Go to diff View file
M src/www/scripts/codendi/RichTextEditor.js +5 −0 Go to diff View file
A src/www/scripts/tuleap/tuleap-mention.js +54 −0 Go to diff View file
A src/www/scripts/vendor/at/css/atwho.min.css +1 −0 Go to diff View file
A src/www/scripts/vendor/at/js/atwho.min.js +1 −0 Go to diff View file
A src/www/scripts/vendor/at/js/caret.min.js +2 −0 Go to diff View file
M src/www/themes/FlamingParrot/FlamingParrot_Theme.class.php +1 −0 Go to diff View file
A src/www/themes/common/css/utils/mention.less +10 −0 Go to diff View file
M src/www/themes/common/css/utils/utils.less +1 −0 Go to diff View file
M tests/rest/UserGroupTest.php +49 −42 Go to diff View file
M tests/rest/UsersTest.php +7 −6 Go to diff View file