Commit Graph

663 Commits

Author SHA1 Message Date
blizzz 7ab19366dc
Merge pull request #11257 from nextcloud/prevent-comment-being-composed-from-overlapping-the-submit-button
Prevent comment being composed from overlapping the submit button
2018-09-18 11:40:53 +02:00
Daniel Calviño Sánchez 9cb8b51d42 Fix position of contacts menu shown on mentions
There are no default CSS rules for the contacts menu, as its position
depends on the element on which it is shown. Note, however, that if no
explicit rules are provided the contacts menu on mentions is affected by
the rules for the contacts menu on shares from the sharing tab.

The contacts menu is now positioned to show the tip of the arrow
horizontally aligned with the center of the avatar, and with the top of
the menu slightly below the bottom border of the mention.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-15 19:53:06 +02:00
Daniel Calviño Sánchez 527d237289 Fix contacts menu not triggered on certain areas of a mention
The contacts menu was triggered only when the avatar or the name of the
user were clicked. Due to this, clicking on certain (small) areas of a
mention (like the right end, or the space between the avatar and the
name) did not show the contacts menu. Now the contacts menu is shown
when any area of the mention is clicked.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-15 18:42:52 +02:00
Nextcloud bot 6112adfe06
[tx-robot] updated from transifex 2018-09-14 00:12:27 +00:00
Nextcloud bot 10351cb9da
[tx-robot] updated from transifex 2018-09-13 00:12:08 +00:00
Nextcloud bot e9c644412c
[tx-robot] updated from transifex 2018-09-10 00:13:36 +00:00
Daniel Calviño Sánchez c65042099f Prevent comment being composed from overlapping the submit button
The submit button is placed in the text area using absolute positioning,
so it is not taken into account when calculating the text layout. Due to
this it is necessary to add an explicit padding to the right of the text
area to prevent the text from overlapping the submit button.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-06 18:10:18 +02:00
Roeland Jago Douma 0899f2cbc4
Merge pull request #11064 from nextcloud/fix-markup-and-style-of-mentions-in-comments
Fix markup and style of mentions in comments
2018-09-05 20:49:11 +02:00
Daniel Calviño Sánchez bd75366016 Add new line at the end of file
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:35:38 +02:00
Daniel Calviño Sánchez 92bf1cec44 Ensure that the avatar and the user name will be kept together
Otherwise a line break could be added between the avatar and the user
name when the wrapper is close to the right border of the message.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:35:38 +02:00
Daniel Calviño Sánchez 45cde96d83 Remove unneeded CSS rule for mentions
Most of the properties of the rule are not needed for mentions, so the
rule is no longer applied to them; the only needed property was moved to
the main rule for mentions.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez 99989b37ff Fix pointer cursor not shown on avatars
When the cursor is on an avatar wrapper the cursor is shown as a pointer
to inform the user that it can be clicked (which will either show the
contacts menu or insert a mention, depending on the case); the cursor
must be explicitly defined for the "img" element that shows the avatar
too, or otherwise the default cursor would be shown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez 83bf3095cf Highlight mentions to the current user
Like done in Talk, mentions to the current user are now shown with the
primary colors to make them more prominent.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez be5a1faf70 Ensure that the user name is shown in bold in mentions
Different browsers use different font weights for strong elements
(Chromium uses "bold", but Firefox uses "bolder", which is relative to
the font weight of the parent), so now the user name in mentions is
explicitly shown with a bold weight.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez 63ab5d919e Reformat embedded HTML code to resemble HTML code
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez db1fce6a59 Remove space between avatar and user name
The avatar should be shown immediately after the avatar to be able to
accurately define the space between them using only CSS rules.

Note that in the case of the "atwho" menu it is not really needed, as a
whitespace removal seems to be done automatically by the plugin, but it
was modified for its displayed elements too for consistency.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:35:37 +02:00
Daniel Calviño Sánchez c9ce96ff05 Show avatar using "span" instead of "div"
Visually it makes no difference, but as the ".avatar" element is inside
a "span" element it can not be a block element to be compliant with the
HTML specification.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-09-05 18:33:10 +02:00
Joas Schilling 47cc5e5895
Update version requirements and versions of shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-09-05 14:27:06 +02:00
Nextcloud bot 021dad53be
[tx-robot] updated from transifex 2018-09-01 00:12:17 +00:00
Morris Jobke ab9672a32f
Merge pull request #10913 from nextcloud/do-not-parse-html-in-user-id-and-display-name
Do not parse HTML in user id and display name
2018-08-30 20:52:20 +02:00
Nextcloud bot 4da9a15b32
[tx-robot] updated from transifex 2018-08-30 00:12:07 +00:00
Nextcloud bot 27141a960f
[tx-robot] updated from transifex 2018-08-29 00:12:07 +00:00
Joas Schilling 5ba881ba41 Do not parse HTML in user id and display name
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-28 18:57:07 +02:00
Nextcloud bot 8b47f45afa
[tx-robot] updated from transifex 2018-08-27 00:12:14 +00:00
Julius Härtl e312766783
Fix contactsmenu for mentioned users in comments
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-25 18:25:47 +02:00
Nextcloud bot d644cafae7
[tx-robot] updated from transifex 2018-08-25 00:12:33 +00:00
Nextcloud bot 503fbc953e
[tx-robot] updated from transifex 2018-08-24 00:12:20 +00:00
Nextcloud bot c0f48a7b40
[tx-robot] updated from transifex 2018-08-23 00:12:59 +00:00
Nextcloud bot ccb040ee01
[tx-robot] updated from transifex 2018-08-13 00:12:09 +00:00
Roeland Jago Douma 90a656305b
Bump autoloaders
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-10 15:03:22 +02:00
Nextcloud bot 1cb8fe3cb0
[tx-robot] updated from transifex 2018-08-08 00:13:19 +00:00
Nextcloud bot 0c7a17795b
[tx-robot] updated from transifex 2018-07-28 00:12:07 +00:00
Nextcloud bot 6ccc34f5af
[tx-robot] updated from transifex 2018-07-27 00:12:20 +00:00
Nextcloud bot e98f4de66a
[tx-robot] updated from transifex 2018-07-26 00:12:01 +00:00
Morris Jobke 61397ee091
Merge pull request #9222 from nextcloud/feature/noid/search-for-files-by-comments
Allow to search files by comments
2018-07-25 20:30:00 +02:00
Morris Jobke 2dd55b0550
Brighter comments icon
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-25 20:28:49 +02:00
Joas Schilling ac2314e3d0 Add pagination support
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-25 18:53:45 +02:00
Joas Schilling 8c7969e730 Allow to search by comments
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-25 18:53:44 +02:00
Julius Härtl 6d29b36200
Limit small avatar rendering only to inline mentions
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-25 14:26:04 +02:00
Joas Schilling 80207d72fa Correctly register everything via the Application class
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-25 10:26:06 +02:00
John Molakvoæ (skjnldsv) 52af49ead5
Fixed comments design
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-24 12:34:03 +02:00
John Molakvoæ (skjnldsv) b7317a35e7
Focus the comment input on tab select/loading
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-24 12:34:02 +02:00
Nextcloud bot 241e5705cb
[tx-robot] updated from transifex 2018-07-24 00:12:01 +00:00
Morris Jobke 9732712dda
Merge pull request #10286 from nextcloud/bugfix/noid/comments-layout
Fix comment input overlay on empty discussion
2018-07-19 10:36:25 +02:00
Julius Härtl 9771b70c8f
Fix inline avatar display for mentions in comments
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-18 20:28:02 +02:00
Julius Härtl 750b204ac7
Fix comment input overlay on empty discussion
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-07-18 19:52:16 +02:00
Nextcloud bot a22bc0e787
[tx-robot] updated from transifex 2018-07-10 08:21:14 +00:00
Nextcloud bot a6666071be
[tx-robot] updated from transifex 2018-06-27 00:11:52 +00:00
Nextcloud bot e4551106f5
[tx-robot] updated from transifex 2018-06-22 00:12:11 +00:00
Nextcloud bot f9c98d8621
[tx-robot] updated from transifex 2018-06-21 00:12:47 +00:00
John Molakvoæ (skjnldsv) 26918e4103
Various apps scss
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:20:51 +02:00
Nextcloud bot 5e5671983c
[tx-robot] updated from transifex 2018-06-17 00:12:48 +00:00
Nextcloud bot d91bed9490
[tx-robot] updated from transifex 2018-06-12 00:12:46 +00:00
Nextcloud bot ae3bdb4fb9
[tx-robot] updated from transifex 2018-06-09 00:13:06 +00:00
Nextcloud bot bba1663350
[tx-robot] updated from transifex 2018-06-06 00:12:36 +00:00
Nextcloud bot 36d74047f7
[tx-robot] updated from transifex 2018-06-03 00:12:47 +00:00
Nextcloud bot d3fceb9b83
[tx-robot] updated from transifex 2018-06-01 00:12:28 +00:00
Nextcloud bot 9ac36dc30b
[tx-robot] updated from transifex 2018-05-31 00:12:36 +00:00
Nextcloud bot 7df563ee39
[tx-robot] updated from transifex 2018-05-30 00:12:08 +00:00
Nextcloud bot 2b2bbe359e
[tx-robot] updated from transifex 2018-05-28 00:12:45 +00:00
Nextcloud bot 9e00b51c87
[tx-robot] updated from transifex 2018-05-27 00:13:07 +00:00
Nextcloud bot f0fdac8078
[tx-robot] updated from transifex 2018-05-26 00:13:01 +00:00
Nextcloud bot 60734cd79d
[tx-robot] updated from transifex 2018-05-25 00:14:54 +00:00
Nextcloud bot 4bbad8f88a
[tx-robot] updated from transifex 2018-05-23 00:15:44 +00:00
Nextcloud bot 0d90c5ebc4
[tx-robot] updated from transifex 2018-05-22 00:13:31 +00:00
Nextcloud bot 514b374923
[tx-robot] updated from transifex 2018-05-18 00:13:45 +00:00
Nextcloud bot ef665fde42
[tx-robot] updated from transifex 2018-05-17 00:13:46 +00:00
Nextcloud bot 05df524472
[tx-robot] updated from transifex 2018-05-13 00:12:56 +00:00
Nextcloud bot 01c21601e8
[tx-robot] updated from transifex 2018-05-10 00:13:09 +00:00
Nextcloud bot 3e14f21ae7
[tx-robot] updated from transifex 2018-04-25 00:11:50 +00:00
Nextcloud bot 74b5ab8d39
[tx-robot] updated from transifex 2018-04-22 00:11:51 +00:00
Abijeet 0489643f50 Fixes issue with the large cursor on Safari in the comment section.
This was being caused due to the `display: inline-block` on the contenteditable div.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-04-14 20:28:32 +05:30
Nextcloud bot b7a64f9c13
[tx-robot] updated from transifex 2018-04-13 00:11:47 +00:00
Nextcloud bot af53f48ce2
[tx-robot] updated from transifex 2018-04-12 00:19:20 +00:00
Morris Jobke a18a853e68
Merge pull request #7800 from Abijeet/bug-7281
Fixes the usability issues with the comment section delete and edit
2018-04-11 15:27:12 +02:00
Nextcloud bot 5105f1d466
[tx-robot] updated from transifex 2018-04-03 00:11:47 +00:00
Nextcloud bot 9dad5ac59b
[tx-robot] updated from transifex 2018-03-28 00:21:16 +00:00
Abijeet 16bf9326cb Fixing failing test cases due to change in functionality.
Also fixes scrutinizer warnings.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 01:34:00 +05:30
Abijeet 18096f55d0 Disabled comment changes opacity only for message text.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
Abijeet 01c5a31a4a Adds a tooltip for the submit / save button in comments.
Towards #7281

Also hiding the menu before triggering click action.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
Abijeet 6d2716dceb Added ellipsis for longer usernames.
Towards #7281

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
Abijeet 872853af58 Moves the edit and delete options into a dropdown menu.
Fixes #7281

- Added a new View to render the dropdown.
- Modified the existing code.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
Abijeet 001cd986ed Converts the css file to scss file, and adds border-top to comments.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
Abijeet 61b38a16fa Fixes the following UI issues,
1. Increased the size of the delete, edit, close and submit buttons to take up 44x44px.
2. Now showing the delete button at all times when editing to avoid usability issues with touch screens.
3. Edit icon is also shown at all times, rather than only on hover.
4. Reduced the gap between comments a wee bit.
5. Fixed issues with focus event now working properly for edit and delete.
6. Removed absolute positioning of elements for alignment.
7. Fixed issue with tooltips becoming too high due to padding around actions. Occurred due to my changes.
8. Changed the position of the submit and close icons.
9. Fixed issue with jumping of the delete icon in Firefox. Occurred due to my changes.
10. Fixed issue with wrapping of content due to long author names. Occurred due to my changes.
11. Fixed issue with longer comments not appearing properly. This might have occurred due to my changes.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
Abijeet b3e1026cab Fixes div being added placed directly under ul during editing of comments.
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
Abijeet facd1cae2f Fixes issue where saving a non-modified comment kept the edit window open.
Now irrespective of the whether the comment has been modified we are going to go back to the view mode.

Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
Nextcloud bot e2b44d199b
[tx-robot] updated from transifex 2018-03-26 00:13:15 +00:00
Nextcloud bot 89ebb8a663
[tx-robot] updated from transifex 2018-03-25 01:09:58 +00:00
Nextcloud bot 64948bf30c
[tx-robot] updated from transifex 2018-03-23 01:11:28 +00:00
Joas Schilling dabd7291c3
Make the new autocomplete endpoint OCS
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-21 09:46:52 +01:00
Nextcloud bot 615258ba26
[tx-robot] updated from transifex 2018-03-20 01:11:33 +00:00
Nextcloud bot 7f00de841b
[tx-robot] updated from transifex 2018-03-14 01:11:29 +00:00
Nextcloud bot 3cae276149
[tx-robot] updated from transifex 2018-03-13 01:12:01 +00:00
Nextcloud bot 4e56a02450
[tx-robot] updated from transifex 2018-03-12 01:12:21 +00:00
Nextcloud bot f08bc1bc6f
[tx-robot] updated from transifex 2018-03-10 01:11:58 +00:00
Nextcloud bot 3867a74f0d
[tx-robot] updated from transifex 2018-03-06 01:12:16 +00:00
Nextcloud bot 6c49cc0294
[tx-robot] updated from transifex 2018-03-05 01:12:12 +00:00
Nextcloud bot 6975cef00b
[tx-robot] updated from transifex 2018-03-04 01:12:42 +00:00
Nextcloud bot 3b000d4f91
[tx-robot] updated from transifex 2018-03-03 01:12:14 +00:00
rakekniven b348cd170a
Update commentstabview.js
Changed typo reported at GitHub.
See https://www.transifex.com/nextcloud/nextcloud/translate/#de_DE/$/91002505?issue=yes
2018-03-01 20:53:50 +01:00
Morris Jobke 612e875f60
Merge pull request #8355 from nextcloud/fix-comments-num-index
Fix comments (and systemtags) when involving users with numerical ids
2018-02-26 17:12:57 +01:00
Joas Schilling f095001e4b
Fix info.xml files of shipped apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-16 10:24:03 +01:00
Morris Jobke d3d045dd5c
Remove unused import statements
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-14 16:55:43 +01:00
Arthur Schiwon 023d028c57
fix creating comments when file is accessible to users with numeric ids
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-02-14 14:39:39 +01:00
Arthur Schiwon a5a0a938f2
test creating comments with numeric user ids
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-02-14 14:39:10 +01:00
Nextcloud bot 3fc6d6234e
[tx-robot] updated from transifex 2018-02-13 10:48:27 +00:00
Nextcloud bot 91c67eb667
[tx-robot] updated from transifex 2018-02-12 21:33:37 +00:00
Nextcloud bot 15b4797629
[tx-robot] updated from transifex 2018-02-09 01:10:53 +00:00
Nextcloud bot a0dfc7d34a
[tx-robot] updated from transifex 2018-02-05 01:10:16 +00:00
Nextcloud bot 58b568fd5d
[tx-robot] updated from transifex 2018-02-04 01:10:28 +00:00
Morris Jobke c1e4f9f305
Use type casting instead of *val() method
It should be up to 6x faster

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-26 11:35:42 +01:00
Morris Jobke 7800a9bc24
Fix array method usages with a proper call
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-25 22:20:10 +01:00
Roeland Jago Douma db411f8771
Bump apps
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 11:40:53 +01:00
Morris Jobke f578b69729
Update composer
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 23:16:10 +01:00
Roeland Jago Douma 0280cff66f
Composer updated
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-04 16:31:16 +01:00
Nextcloud bot 298b79410d
[tx-robot] updated from transifex 2018-01-04 09:48:31 +00:00
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
Arthur Schiwon 582d2d36ee
fix avatar loading for generic placeholders
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 14:42:21 +01:00
Arthur Schiwon d0f2f5f1de
remove more vendor-imported files that aren't necessary
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 14:06:16 +01:00
Arthur Schiwon bcfac75b06
simplify registration of manager in server container
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 13:55:03 +01:00
Arthur Schiwon 4b24dea6c7
only ship minimized js files
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 12:28:22 +01:00
Arthur Schiwon d5f1cef642
fix comment sorter
background: we have a flat hierarchy of comments, not a tree. therefore we
can also remove again the unnecessary additions.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-30 15:59:43 +01:00
Arthur Schiwon 61db8615f4
preserve line breaks
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-30 11:10:04 +01:00
Arthur Schiwon ca72c0150b
configurable amount of autocomplete results in comments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 13:50:38 +02:00
Arthur Schiwon bd951e926f
avatar css fixes
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 12:34:24 +02:00
Arthur Schiwon eace507043
apply our theming
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 00:32:47 +02:00
Arthur Schiwon aa2fd30775
autocomplete on demand
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-26 15:25:24 +02:00
Roeland Jago Douma 112b0d57a8
Comments Autoloader
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:11 +02:00
Morris Jobke 43e498844e
Use ::class in test mocks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:45:32 +02:00
Nextcloud bot 1860190305
[tx-robot] updated from transifex 2017-10-24 00:08:45 +00:00
Morris Jobke 28016a2a70
Box-shadow does not need vendor prefix anymore
https://developer.mozilla.org/en-US/docs/Web/CSS/box-shadow
http://caniuse.com/#search=box-shadow

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-23 20:14:31 +02:00
Arthur Schiwon fb40afc4d4
enable autocomplete when editing comments
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 18:00:39 +02:00
Arthur Schiwon eb8f1247fe
fix unstable comment order
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 15:37:36 +02:00
Joas Schilling 143ff6a622
Add a doc why this should not be removed
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-10-23 12:35:55 +02:00
Arthur Schiwon de8a475b0b
fix contactsmenu-popup
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:34 +02:00
Arthur Schiwon ccbcce978f
convert mentions after save to the plain format we use
also ensures proper rendering, even of edited comments

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:34 +02:00
Arthur Schiwon 8d9f485b35
when writing a comment, render mentions as they'd appear anywhere
i.e. avatar with displaymenu and contactsmenu-popover

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon ec5607544c
turn textarea to contenteditable div
we will need it for nice formatting of the mentioned user

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon d1afbedc5f
setup atwho autocomplete
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon 8e60a2bd28
add At.js and dependencies
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
Arthur Schiwon 04fafdd505
fix class name in info.xml
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:37 +02:00
Arthur Schiwon 8722458d2a
ensure that sorting is stable
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:37 +02:00
Arthur Schiwon fd6daf8d19
AutoCompletion backend
* introduce a Controller for requests
* introduce result sorting mechanism
* extend Comments to retrieve commentors (actors) in a tree
* add commenters sorter
* add share recipients sorter

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:32 +02:00
Nextcloud bot 436daf92e5
[tx-robot] updated from transifex 2017-10-07 00:08:31 +00:00
Nextcloud bot 3d981c0d40
[tx-robot] updated from transifex 2017-10-04 00:08:27 +00:00
Nextcloud bot 8be053516b
[tx-robot] updated from transifex 2017-09-30 00:08:25 +00:00
Nextcloud bot e5d39e63d1
[tx-robot] updated from transifex 2017-09-28 00:08:36 +00:00
Joas Schilling 10c7ecb5e9
Use the wrapper to get the parameters which was added in #6369
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-19 15:01:43 +02:00
Nextcloud bot 5ce3c7003b
[tx-robot] updated from transifex 2017-09-13 00:08:12 +00:00
Joas Schilling 521ede8f5f
Allow translations of the comments activity in the emails too
Message and object data is not available on emails atm,
so we can not use them either...

Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-09-05 18:10:32 +02:00
Nextcloud bot 7b8bd8188e
[tx-robot] updated from transifex 2017-08-25 00:08:59 +00:00