Граф коммитов

3236 Коммитов

Автор SHA1 Сообщение Дата
Mario Danic 3d9fb47a0d
Add session id to participant
This allows for showing if user is online or not in the conversation info list without needing another API call

Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-11-12 11:35:31 +01:00
Joas Schilling c58cfc54a4
Merge pull request #1287 from nextcloud/fix-vertical-position-of-contacts-menu-on-author-row
Fix vertical position of contacts menu on author row
2018-11-12 11:31:05 +01:00
Joas Schilling ee5b10650e
Fix user mentions with spaces
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-12 11:28:25 +01:00
Joas Schilling 7c62787ab1
Merge pull request #1240 from nextcloud/bugfix/noid/avatar-on-mentions-from-guests
Fix avatars of users in guest sytem messages
2018-11-12 11:21:08 +01:00
Joas Schilling 95cce7d84c
Merge pull request #1273 from nextcloud/add-support-for-sending-the-password-for-a-link-share-by-nextcloud-talk
Add support for sending the password for a link share by Nextcloud Talk
2018-11-12 11:16:11 +01:00
Daniel Calviño Sánchez 7bce81b9f1 Fix vertical position of contacts menu on author row
The absolute position of the contacts menu is relative to the author
row, so it has to be pushed down to not overlap the author name and
avatar.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-09 18:32:18 +01:00
Joas Schilling 78c1fae7a2 Make guest avatars grey again
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-09 17:05:32 +01:00
Joas Schilling 21d791a721 Fix avatars of users mentioned in guest messages
The model holds the data for the message author, but it is not
applicable when setting the avatar for mentions, as in that case each
mention has its own user data.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-09 17:02:13 +01:00
Daniel Calviño Sánchez 0ddcf611db Get the user id from the model for the contacts menu of the author
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-09 15:21:40 +01:00
Daniel Calviño Sánchez 8dbd7ca657 Unify "data-displayname" and "data-user-display-name" as the later
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-09 14:42:15 +01:00
Daniel Calviño Sánchez ca90cb2666 Unify "data-username" and "data-user-id" as the later
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-09 14:42:04 +01:00
Daniel Calviño Sánchez 073396826f Rename "data-user" to "data-user-id"
When its first parameter is undefined the "avatar()" function gets the
user id from the "data-user" attribute, so now the user id must be given
explicitly.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-09 14:28:44 +01:00
Joas Schilling 876165bfde
Make the notification clickable again
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-09 13:30:28 +01:00
Joas Schilling b7d907700d
Merge pull request #1268 from nextcloud/add-ability-to-invite-groups
Add ability to invite groups
2018-11-09 11:33:14 +01:00
Joas Schilling 3f560f3315
Merge pull request #1285 from nextcloud/fix-room-name-in-callinfoview-for-share-password-rooms
Fix room name in CallInfoView for "share:password" rooms
2018-11-09 10:08:20 +01:00
Joas Schilling 86f25fb2a5 Add the file to the notification subject
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-08 21:07:40 +01:00
Daniel Calviño Sánchez e13571f8f3 Add support for link shares in "share:password" rooms
Until now only the e-mail shares had support for sending the password by
Talk. In Nextcloud 15 that feature was added to link shares too, so the
room name and the notification sent for "share:password" rooms has to be
adjusted accordingly.

The display name of "share:password" rooms is generated from the raw
name of the room (the e-mail for mail shares and the file name for link
shares) each time the room information is sent by the server, so the
display name was generalized to accomodate both types of raw names.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-08 21:00:36 +01:00
Daniel Calviño Sánchez 86f7c8f0f2 Remove unused attribute
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-08 20:59:41 +01:00
Daniel Calviño Sánchez 8e4417eea2 Fix room name in CallInfoView for "share:password" rooms
The name of rooms for requesting a password by Talk is generated by the
server each time a room or the list of rooms is fetched, and it should
not be editable by the user. Moreover, the "name" attribute is the raw
name from which the "displayName" attribute is generated, and thus the
later is the one that should be shown for "share:password" rooms.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-08 18:32:47 +01:00
Daniel Calviño Sánchez cd0ccf4ae9
Remove outdated documentation
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-08 13:53:14 +01:00
Nextcloud bot 42b1101c76
[tx-robot] updated from transifex 2018-11-08 01:35:56 +00:00
Joas Schilling 931386a55d
Merge pull request #1280 from nextcloud/bugfix/noid/use-short-urls-for-notifications
Use short beautiful links for notifications
2018-11-07 19:34:54 +01:00
Joas Schilling 83861e53e1
Use short beautiful links for notifications
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-07 17:45:34 +01:00
Joas Schilling a0d78426c9
Merge pull request #1267 from nextcloud/bugfix/1260/better-notifications-for-password-shares
Better notifications for password shares
2018-11-07 17:43:20 +01:00
Daniel Calviño Sánchez 294be0c05e Get shared with e-mail from the share instead of from the room name
This prepares the code for future changes in which the password could be
requested for other types of shares.

Note that the notification of a password request is just a regular call
notification; thus, the share is not provided in the notification
parameters and it has to be got from the ID of the object associated to
the room (as in "share:password" rooms the object ID is the share
token).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-07 15:57:37 +01:00
Joas Schilling 6c06a87133
Adjust capability
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-06 19:33:25 +01:00
Joas Schilling 10c847b0c5
Merge the email-invite into the new universal endpoint
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-06 17:29:05 +01:00
Joas Schilling 3aba43b3d2
Fix adding groups via the web UI
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-06 17:10:15 +01:00
Joas Schilling ad06759f2e
Make the code more future proof and explicit
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-06 16:51:10 +01:00
Mario Danic 9c74620453
Add ability to invite groups
Fix a missing ,

Move to tabs
2018-11-06 16:20:35 +01:00
Nextcloud bot 8f4051de65
[tx-robot] updated from transifex 2018-11-06 01:37:23 +00:00
Daniel Calviño Sánchez e7f9fab1a6 Load the signaling settings before starting the embedded Talk app
Unlike in the regular Talk app when Talk is embedded the signaling
settings are not initially included in the HTML, so they need to be
explicitly loaded before starting the app.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-05 12:08:59 +01:00
Daniel Calviño Sánchez c1840244e1 Fix initializing the app twice
When Talk is embedded in the public share authentication page the app is
explicitly initialized in "publicshareauth.js" (as some special setup
for the settings will be needed in that case); "init.js" should be used
only for the regular Talk app.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-05 11:04:42 +01:00
Nextcloud bot 3ffd6fd641
[tx-robot] updated from transifex 2018-11-02 01:38:47 +00:00
Nextcloud bot 5b36480d05
[tx-robot] updated from transifex 2018-10-30 01:39:13 +00:00
Nextcloud bot 63bba57f95
[tx-robot] updated from transifex 2018-10-27 00:38:28 +00:00
Nextcloud bot 69f32b116c
[tx-robot] updated from transifex 2018-10-26 00:37:41 +00:00
Ivan Sein 93325f873e
Merge pull request #1269 from nextcloud/development-setup
Add quick development setup introduction
2018-10-25 17:30:39 +02:00
Jan-Christoph Borchardt b9aa5e44cd
Add quick development setup introduction
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-10-25 17:06:52 +02:00
Nextcloud bot de4050edec
[tx-robot] updated from transifex 2018-10-24 00:37:27 +00:00
Nextcloud bot 3501e6b650
[tx-robot] updated from transifex 2018-10-23 00:30:23 +00:00
Joas Schilling d612e845f9
Better notifications for password shares
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-10-22 12:01:11 +02:00
Nextcloud bot 62e7465a6d
[tx-robot] updated from transifex 2018-10-22 00:31:49 +00:00
Nextcloud bot 581bf17cec
[tx-robot] updated from transifex 2018-10-20 00:30:19 +00:00
Nextcloud bot 4481e8eb52
[tx-robot] updated from transifex 2018-10-18 00:30:55 +00:00
Daniel Calviño Sánchez 73a056f4ee Ignore "templates.js" files when linting
The "templates.js" files are compiled by Handlebars from the source
templates, so there is no point in checking for problems like defined
but not used variables.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-10-16 10:34:18 +02:00
Roeland Jago Douma 403ef12330 Move admin templates to compiled handlebars
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-16 10:34:18 +02:00
Nextcloud bot a074c03781
[tx-robot] updated from transifex 2018-10-16 00:29:16 +00:00
Ivan Sein cf3d68f400
Merge pull request #1257 from nextcloud/bugfix/noid/csp-for-guests
Fix CSP also for guests
2018-10-15 16:41:07 +02:00
Joas Schilling 3473a76276
Fix CSP also for guests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-10-15 16:05:10 +02:00