Commit Graph

397 Commits

Author SHA1 Message Date
Arthur Schiwon 282567fced
format links in comments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-03 13:11:20 +01:00
Roeland Jago Douma 4c0c3c0bef
Show max warning comment lenth again
Fixes #7414

Since we no longer use an input field we have to use text instead of
val.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-02 10:28:09 +01:00
Roeland Jago Douma 49b095b78e
Use proper authorative-autoloader for app autoloaders
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-12-14 08:31:31 +01:00
Arthur Schiwon 099a340bf5
The user displayNameResolver is specific to users, not the comments app
Other apps like spreed rely on it, and only can resolver per type can
be registered anyhow.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-12-12 17:36:31 +01:00
Nextcloud bot a684f033bd
[tx-robot] updated from transifex 2017-12-10 01:10:25 +00:00
Nextcloud bot 855acc727b
[tx-robot] updated from transifex 2017-12-09 01:10:24 +00:00
Morris Jobke 5724e75827
Merge pull request #7252 from nextcloud/send-comment-on-enter
Submit comments with Enter and use Shift+Enter for new lines
2017-12-08 15:31:10 +01:00
Daniel Calviño Sánchez 9b1f3b969e Fix Enter sending comment instead of adding autocomplete item to message
When the autocomplete popover is shown the At.js plugin listens on the
message input field for key down events, and when Enter is pressed it
adds the selected item to the message. However, as "_onTypeComment" also
handles key down events for the message input field, when Enter was
pressed the comment was submitted and At.js had no chance to add the
item before that happened. Now when Enter is pressed and the
autocomplete popover is shown the comment is not submitted, and thus
At.js adds the selected item to the message as expected.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-12-07 15:38:46 +01:00
Nextcloud bot 9505c56447
[tx-robot] updated from transifex 2017-12-06 01:10:23 +00:00
Nextcloud bot f25d55c972
[tx-robot] updated from transifex 2017-12-05 01:10:20 +00:00
Nextcloud bot 567757c793
[tx-robot] updated from transifex 2017-12-04 01:10:30 +00:00
Nextcloud bot cec236f0af
[tx-robot] updated from transifex 2017-12-02 01:10:32 +00:00
Nextcloud bot ffc627e18e
[tx-robot] updated from transifex 2017-12-01 01:10:20 +00:00
Daniel Calviño Sánchez c43f64d56b Add unit tests for posting comments with enter key
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-30 19:30:27 +01:00
Daniel Calviño Sánchez d03fcbca77 Set text only in the message div of the new comment form
When finding ".message" elements on "view.$el" the message area for the
new comment form and all the comments were matched. Now the selector was
restricted to match only the message area for the new comment form.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-30 19:29:19 +01:00
Nextcloud bot 49ec86a81f
[tx-robot] updated from transifex 2017-11-30 01:13:19 +00:00
Roeland Jago Douma f03aa0480a
Merge pull request #7316 from nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251
Fix silent conflicts due to merging #7256 after #7251
2017-11-29 15:38:24 +01:00
Nextcloud bot 095eba0aa3
[tx-robot] updated from transifex 2017-11-29 01:10:12 +00:00
Daniel Calviño Sánchez 0c45778219 Fix silent conflicts due to merging #7256 after #7251
Although #7256 was merged cleanly some of the changes really conflicted
with those introduced by the last commit of #7251, and this broke the
appearance of the author row of comments. This commit fixes those silent
conflicts and restores the appearance of the author row.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-28 02:35:39 +01:00
Nextcloud bot a0ce2c1204
[tx-robot] updated from transifex 2017-11-28 01:09:52 +00:00
blizzz e428ef9d75
Merge pull request #7256 from nextcloud/fix-cursor-for-avatar-and-user-names-in-comments
Fix cursor for avatar and user names in comments
2017-11-27 15:14:40 +01:00
Morris Jobke cfae590ac9
Merge pull request #7266 from nextcloud/fix-input-field-not-disabled-while-a-comment-is-being-sent
Fix input field not disabled while a comment is being sent
2017-11-27 13:40:03 +01:00
Morris Jobke 7bb42438fa
Merge pull request #7280 from nextcloud/fix-working-icon-position-when-sending-or-deleting-a-comment
Fix working icon position when sending or deleting a comment
2017-11-27 12:19:21 +01:00
Morris Jobke c5446ebd9a
Merge pull request #7251 from nextcloud/contact-menu-position-fix
Fixed contact menu position on comments
2017-11-27 12:14:30 +01:00
Lukas Reschke d15ca9ffaf
Replace with non-deprecated JS call
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 11:53:24 +01:00
Morris Jobke 4af12dcab1
Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 08:50:44 +01:00
Allan Nordhøy 011e05574f
that has since been deleted, ID to node
You were mentioned in a group chat by a user that has since been deleted

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 08:50:39 +01:00
Daniel Calviño Sánchez ea4414f9bc Disable contacts menu for mentions to current user in comment messages
The contacts menu is not shown for avatars and user names in the author
row if they represent the current user. For consistency, and because the
contacts menu provides no value when shown for the current user, this
commit also disables the contacts menu for mentions to the current user.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 00:10:53 +01:00
Daniel Calviño Sánchez 8eb19a278c Disable contacts menu for mentioned users in comments being composed
The contacts menu does not provide too much value for users mentioned in
a message being composed, so it is now disabled in this case.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-27 00:05:54 +01:00
Daniel Calviño Sánchez 107952ff00 Fix cursor for author row and avatars in comments
When it was on an author row the cursor was shown as a pointer, even if
clicking on the author row itself does nothing. On the other hand,
avatars used the default cursor, even if clicking on them either shows
the contacts menu (in the case of the author row, only when the avatar
is for a different user than the current one) or inserts a mention (for
avatars shown in the list of suggested mentions), depending on the case.

Now, the author row uses the default cursor, and avatars (and their
associated user name) use a pointer cursor if clicking on them will
trigger an action (either showing the contacts menu or inserting a
mention).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-26 23:56:03 +01:00
Daniel Calviño Sánchez 9bb2bb7870 Show delete working icon at the same position as the delete icon
When a comment was being deleted the submit working icon was shown. Now
the submit working icon is kept hidden in that case and a specific
delete working icon, which is shown at the same position as the delete
icon, is used instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-24 16:31:37 +01:00
Daniel Calviño Sánchez 6e9c0b9085 Show submit working icon at the same position as the submit confirm icon
The submit confirm icon is shown as the background image of an
absolutely positioned input element, so the CSS rules for the submit
working icon were modified to match those of the submit confirm icon.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-24 16:30:58 +01:00
Daniel Calviño Sánchez 5e6d4ad27c Disable elements while a comment is being deleted
When a comment is being deleted the "disabled" class is added to the
comment div, which causes it to look disabled. However, the input
elements and the content editable div were not truly disabled, and thus
it was still possible to interact with them. This commit ensures that
they are properly disabled while the comment is being deleted.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-24 13:17:55 +01:00
Daniel Calviño Sánchez bbe00079cc Fix input field not disabled while a comment is being sent
Since the change of the text area to a content editable div the input
field was no longer disabled while a new comment was being sent. It was
caused by still trying to disable the div using the "disabled" property,
which works only on real input fields; when using a content editable div
the way to disable it is by setting "contenteditable" to "false".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 14:34:09 +01:00
John Molakvoæ (skjnldsv) 5591ea6e8b Fixed alignment of items in comments
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-23 12:26:22 +01:00
Daniel Calviño Sánchez 60a73bab1c Submit comments with Enter and use Shift+Enter for new lines
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 03:27:16 +01:00
Daniel Calviño Sánchez 4eb9c0142d Fix contacts menu vertical position for comment authors
The contacts menu was being shown as "inline-block", which caused the
top of the menu to be aligned to the top of the author row.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-23 02:12:09 +01:00
Daniel Calviño Sánchez 5d85af79b6 Force breaks on extremely long words
If not broken extremely long words overflow their container.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-11-17 15:10:50 +01:00
Nextcloud bot 6ca4abfc0b
[tx-robot] updated from transifex 2017-11-11 01:10:09 +00:00
Nextcloud bot ede6499de4
[tx-robot] updated from transifex 2017-11-10 01:09:43 +00:00
Nextcloud bot 79c9439c50
[tx-robot] updated from transifex 2017-11-08 01:09:21 +00:00
Nextcloud bot f9b7109de3
[tx-robot] updated from transifex 2017-11-07 01:08:57 +00:00
Morris Jobke 0eebff152a
Update license headers
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
Jan-Christoph Borchardt bd7d0de86f Add variable for border-radius
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-03 14:08:21 +01:00
Nextcloud bot 7e1e9430b6
[tx-robot] updated from transifex 2017-11-03 01:09:06 +00:00
Arthur Schiwon f1570c2c04
update autoloader
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-01 16:30:20 +01:00
Arthur Schiwon e2805f02aa
Merge branch 'master' into autocomplete-gui 2017-11-01 15:37:29 +01:00
Arthur Schiwon 2b4b3b1986
adjust jsunit tests
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-01 11:44:01 +01:00
Joas Schilling ce12cd91db
Merge pull request #6875 from nextcloud/app_autoloaders
Move server apps to dedicated autoloader
2017-11-01 11:15:27 +01:00
blizzz b3ff9a2248
Merge pull request #6849 from nextcloud/fix-missing-translation-of-personal-calendar-in-activity
Fix missing translation of "Personal" calendar in activities
2017-10-31 15:05:26 +01:00