github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-24 05:57:13 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'jonasob-username-matching' into devel

Browse source 
Usernames can now include dots (.) Thanks to jonasob !
This commit is contained in:
Lauri Ojansivu 2017-08-26 03:36:35 +03:00
commit 777b65b1f7
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -10,14 +10,15 @@ This release adds the following new features:
* [Gogs integration part 1](https://github.com/wekan/wekan/pull/1189);
* [Add web manifest so Wekan can be used like standalone app on Desktop
with Chrome or Firefox](https://github.com/wekan/wekan/pull/1184);
* [Copy card link to clipboard](https://github.com/wekan/wekan/issues/1188).
* [Copy card link to clipboard](https://github.com/wekan/wekan/issues/1188);
* [Usernames can now include dots (.)](https://github.com/wekan/wekan/pull/1194).
and fixes the following bugs:
* [Fix Squeezed tickbox in Card](https://github.com/wekan/wekan/pull/1171).
Thanks to GitHub users andresmanelli, danhawkes, kubiko, nztqa and xet7
for their contributions.
Thanks to GitHub users andresmanelli, danhawkes, jonasob, kubiko, nztqa
and xet7 for their contributions.
# v0.32 2017-07-30 Wekan release

2
client/components/lists/listBody.js
View file

@ -180,7 +180,7 @@ BlazeComponent.extendComponent({
$textarea.escapeableTextComplete([
// User mentions
{
match: /\B@(\w*)$/,
match: /\B@([\w.]*)$/,
search(term, callback) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
callback($.map(currentBoard.activeMembers(), (member) => {

4
client/components/main/editor.js
View file

@ -25,7 +25,7 @@ Template.editor.onRendered(() => {
// User mentions
{
match: /\B@(\w*)$/,
match: /\B@([\w.]*)$/,
search(term, callback) {
const currentBoard = Boards.findOne(Session.get('currentBoard'));
callback(currentBoard.activeMembers().map((member) => {
@ -60,7 +60,7 @@ Blaze.Template.registerHelper('mentions', new Template('mentions', function() {
member.username = Users.findOne(member.userId).username;
return member;
});
const mentionRegex = /\B@(\w*)/gi;
const mentionRegex = /\B@([\w.]*)/gi;
let content = Blaze.toHTML(view.templateContentBlock);
let currentMention;

2
sandstorm.js
View file

@ -188,7 +188,7 @@ if (isSandstorm && Meteor.isServer) {
caption = { defaultText: comment.text };
const activeMembers =
_.pluck(Boards.findOne(sandstormBoard._id).activeMembers(), 'userId');
(comment.text.match(/\B@(\w*)/g) || []).forEach((username) => {
(comment.text.match(/\B@([\w.]*)/g) || []).forEach((username) => {
const user = Meteor.users.findOne({ username: username.slice(1)});
if (user && activeMembers.indexOf(user._id) !== -1) {
mentionedUser(user._id);