da57aaf814
[tx-robot] updated from transifex
2018-11-09 01:12:25 +00:00
1b4f1b9a63
Populate the mention-notification with the actual message
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-08 12:10:09 +01:00
375589b274
Fix the comments UI and activities for space-mentions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-07 12:33:44 +01:00
54a30a4b81
[tx-robot] updated from transifex
2018-11-06 01:12:39 +00:00
9d7f02ec47
[tx-robot] updated from transifex
2018-11-04 01:14:02 +00:00
0d1370f2f6
Revert "Populate the mention-notification with the actual message"
...
This reverts commit d295ff5367
2018-10-31 16:16:51 +01:00
d295ff5367
Populate the mention-notification with the actual message
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-10-30 13:29:58 +01:00
0092e3adec
[tx-robot] updated from transifex
2018-10-27 00:12:35 +00:00
d14434fa2e
Adjust some jsdocs
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-24 16:24:16 +02:00
a9fb21f9fc
[tx-robot] updated from transifex
2018-10-23 14:54:28 +00:00
97717ae3a7
Merge pull request #11905 from nextcloud/design/noid/tab-icons
...
Add icon to file sidebar tabs
2018-10-19 16:53:56 +02:00
1b44bdfb58
Add .l10nignore files for compiled assets
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-10-19 10:29:36 +02:00
45804b5bef
Add icon to file sidebar tabs
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-18 15:54:17 +02:00
e7443ee892
Move more comments to compiled handlebars
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-15 19:52:22 +02:00
d9fe68ed12
[tx-robot] updated from transifex
2018-10-05 00:12:56 +00:00
363ec1d3c3
Remove leftover '
...
Followup to #11583
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 16:02:09 +02:00
d281f2625d
Move Comments to compiled handlebars
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-04 09:53:44 +02:00
e375107aa4
Redirect guests to login if they follow the link of a comment mention-notification
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-10-02 08:40:34 +02:00
bdb01064e2
[tx-robot] updated from transifex
2018-09-25 00:12:07 +00:00
cce9f25d86
[tx-robot] updated from transifex
2018-09-23 00:12:30 +00:00
bd89af478e
[tx-robot] updated from transifex
2018-09-22 00:12:06 +00:00
7f6d42c263
Merge pull request #11258 from nextcloud/fix-contacts-menu-on-mentions
...
Fix contacts menu on mentions
2018-09-18 11:42:26 +02:00
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
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
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
6112adfe06
[tx-robot] updated from transifex
2018-09-14 00:12:27 +00:00
10351cb9da
[tx-robot] updated from transifex
2018-09-13 00:12:08 +00:00
e9c644412c
[tx-robot] updated from transifex
2018-09-10 00:13:36 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
021dad53be
[tx-robot] updated from transifex
2018-09-01 00:12:17 +00:00
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
4da9a15b32
[tx-robot] updated from transifex
2018-08-30 00:12:07 +00:00
27141a960f
[tx-robot] updated from transifex
2018-08-29 00:12:07 +00:00
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
8b47f45afa
[tx-robot] updated from transifex
2018-08-27 00:12:14 +00:00
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
d644cafae7
[tx-robot] updated from transifex
2018-08-25 00:12:33 +00:00
503fbc953e
[tx-robot] updated from transifex
2018-08-24 00:12:20 +00:00
c0f48a7b40
[tx-robot] updated from transifex
2018-08-23 00:12:59 +00:00
ccb040ee01
[tx-robot] updated from transifex
2018-08-13 00:12:09 +00:00
90a656305b
Bump autoloaders
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-10 15:03:22 +02:00
1cb8fe3cb0
[tx-robot] updated from transifex
2018-08-08 00:13:19 +00:00
0c7a17795b
[tx-robot] updated from transifex
2018-07-28 00:12:07 +00:00
6ccc34f5af
[tx-robot] updated from transifex
2018-07-27 00:12:20 +00:00
e98f4de66a
[tx-robot] updated from transifex
2018-07-26 00:12:01 +00:00
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
2dd55b0550
Brighter comments icon
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-25 20:28:49 +02:00
ac2314e3d0
Add pagination support
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-25 18:53:45 +02:00
8c7969e730
Allow to search by comments
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-25 18:53:44 +02:00
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
80207d72fa
Correctly register everything via the Application class
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-07-25 10:26:06 +02:00
52af49ead5
Fixed comments design
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-24 12:34:03 +02:00
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
241e5705cb
[tx-robot] updated from transifex
2018-07-24 00:12:01 +00:00
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
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
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
a22bc0e787
[tx-robot] updated from transifex
2018-07-10 08:21:14 +00:00
a6666071be
[tx-robot] updated from transifex
2018-06-27 00:11:52 +00:00
e4551106f5
[tx-robot] updated from transifex
2018-06-22 00:12:11 +00:00
f9c98d8621
[tx-robot] updated from transifex
2018-06-21 00:12:47 +00:00
26918e4103
Various apps scss
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-06-20 19:20:51 +02:00
5e5671983c
[tx-robot] updated from transifex
2018-06-17 00:12:48 +00:00
d91bed9490
[tx-robot] updated from transifex
2018-06-12 00:12:46 +00:00
ae3bdb4fb9
[tx-robot] updated from transifex
2018-06-09 00:13:06 +00:00
bba1663350
[tx-robot] updated from transifex
2018-06-06 00:12:36 +00:00
36d74047f7
[tx-robot] updated from transifex
2018-06-03 00:12:47 +00:00
d3fceb9b83
[tx-robot] updated from transifex
2018-06-01 00:12:28 +00:00
9ac36dc30b
[tx-robot] updated from transifex
2018-05-31 00:12:36 +00:00
7df563ee39
[tx-robot] updated from transifex
2018-05-30 00:12:08 +00:00
2b2bbe359e
[tx-robot] updated from transifex
2018-05-28 00:12:45 +00:00
9e00b51c87
[tx-robot] updated from transifex
2018-05-27 00:13:07 +00:00
f0fdac8078
[tx-robot] updated from transifex
2018-05-26 00:13:01 +00:00
60734cd79d
[tx-robot] updated from transifex
2018-05-25 00:14:54 +00:00
4bbad8f88a
[tx-robot] updated from transifex
2018-05-23 00:15:44 +00:00
0d90c5ebc4
[tx-robot] updated from transifex
2018-05-22 00:13:31 +00:00
514b374923
[tx-robot] updated from transifex
2018-05-18 00:13:45 +00:00
ef665fde42
[tx-robot] updated from transifex
2018-05-17 00:13:46 +00:00
05df524472
[tx-robot] updated from transifex
2018-05-13 00:12:56 +00:00
01c21601e8
[tx-robot] updated from transifex
2018-05-10 00:13:09 +00:00
3e14f21ae7
[tx-robot] updated from transifex
2018-04-25 00:11:50 +00:00
74b5ab8d39
[tx-robot] updated from transifex
2018-04-22 00:11:51 +00:00
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
b7a64f9c13
[tx-robot] updated from transifex
2018-04-13 00:11:47 +00:00
af53f48ce2
[tx-robot] updated from transifex
2018-04-12 00:19:20 +00:00
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
5105f1d466
[tx-robot] updated from transifex
2018-04-03 00:11:47 +00:00
9dad5ac59b
[tx-robot] updated from transifex
2018-03-28 00:21:16 +00:00
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
18096f55d0
Disabled comment changes opacity only for message text.
...
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
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
6d2716dceb
Added ellipsis for longer usernames.
...
Towards #7281
Signed-off-by: Abijeet <abijeetpatro@gmail.com>
2018-03-27 00:49:34 +05:30
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
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
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
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
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
e2b44d199b
[tx-robot] updated from transifex
2018-03-26 00:13:15 +00:00
89ebb8a663
[tx-robot] updated from transifex
2018-03-25 01:09:58 +00:00
64948bf30c
[tx-robot] updated from transifex
2018-03-23 01:11:28 +00:00
dabd7291c3
Make the new autocomplete endpoint OCS
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-21 09:46:52 +01:00
615258ba26
[tx-robot] updated from transifex
2018-03-20 01:11:33 +00:00
7f00de841b
[tx-robot] updated from transifex
2018-03-14 01:11:29 +00:00
3cae276149
[tx-robot] updated from transifex
2018-03-13 01:12:01 +00:00
4e56a02450
[tx-robot] updated from transifex
2018-03-12 01:12:21 +00:00
f08bc1bc6f
[tx-robot] updated from transifex
2018-03-10 01:11:58 +00:00
3867a74f0d
[tx-robot] updated from transifex
2018-03-06 01:12:16 +00:00
6c49cc0294
[tx-robot] updated from transifex
2018-03-05 01:12:12 +00:00
6975cef00b
[tx-robot] updated from transifex
2018-03-04 01:12:42 +00:00
3b000d4f91
[tx-robot] updated from transifex
2018-03-03 01:12:14 +00:00
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
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
f095001e4b
Fix info.xml files of shipped apps
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-02-16 10:24:03 +01:00
d3d045dd5c
Remove unused import statements
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-02-14 16:55:43 +01:00
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
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
3fc6d6234e
[tx-robot] updated from transifex
2018-02-13 10:48:27 +00:00
91c67eb667
[tx-robot] updated from transifex
2018-02-12 21:33:37 +00:00
15b4797629
[tx-robot] updated from transifex
2018-02-09 01:10:53 +00:00
a0dfc7d34a
[tx-robot] updated from transifex
2018-02-05 01:10:16 +00:00
58b568fd5d
[tx-robot] updated from transifex
2018-02-04 01:10:28 +00:00
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
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
db411f8771
Bump apps
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-14 11:40:53 +01:00
f578b69729
Update composer
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-01-12 23:16:10 +01:00
0280cff66f
Composer updated
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-01-04 16:31:16 +01:00
298b79410d
[tx-robot] updated from transifex
2018-01-04 09:48:31 +00:00
282567fced
format links in comments
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-01-03 13:11:20 +01:00
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
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
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
a684f033bd
[tx-robot] updated from transifex
2017-12-10 01:10:25 +00:00
855acc727b
[tx-robot] updated from transifex
2017-12-09 01:10:24 +00:00
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
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
9505c56447
[tx-robot] updated from transifex
2017-12-06 01:10:23 +00:00
f25d55c972
[tx-robot] updated from transifex
2017-12-05 01:10:20 +00:00
567757c793
[tx-robot] updated from transifex
2017-12-04 01:10:30 +00:00
cec236f0af
[tx-robot] updated from transifex
2017-12-02 01:10:32 +00:00
ffc627e18e
[tx-robot] updated from transifex
2017-12-01 01:10:20 +00:00
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
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
49ec86a81f
[tx-robot] updated from transifex
2017-11-30 01:13:19 +00:00
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
095eba0aa3
[tx-robot] updated from transifex
2017-11-29 01:10:12 +00:00
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
a0ce2c1204
[tx-robot] updated from transifex
2017-11-28 01:09:52 +00:00
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
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
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
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
d15ca9ffaf
Replace with non-deprecated JS call
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-11-27 11:53:24 +01:00
4af12dcab1
Fix unit tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-27 08:50:44 +01:00
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
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
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
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
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
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
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
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
5591ea6e8b
Fixed alignment of items in comments
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2017-11-23 12:26:22 +01:00
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
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
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
6ca4abfc0b
[tx-robot] updated from transifex
2017-11-11 01:10:09 +00:00
ede6499de4
[tx-robot] updated from transifex
2017-11-10 01:09:43 +00:00
79c9439c50
[tx-robot] updated from transifex
2017-11-08 01:09:21 +00:00
f9b7109de3
[tx-robot] updated from transifex
2017-11-07 01:08:57 +00:00
0eebff152a
Update license headers
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-06 16:56:19 +01:00
bd7d0de86f
Add variable for border-radius
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-11-03 14:08:21 +01:00
7e1e9430b6
[tx-robot] updated from transifex
2017-11-03 01:09:06 +00:00
f1570c2c04
update autoloader
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-01 16:30:20 +01:00
e2805f02aa
Merge branch 'master' into autocomplete-gui
2017-11-01 15:37:29 +01:00
2b4b3b1986
adjust jsunit tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-11-01 11:44:01 +01:00
ce12cd91db
Merge pull request #6875 from nextcloud/app_autoloaders
...
Move server apps to dedicated autoloader
2017-11-01 11:15:27 +01:00
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
582d2d36ee
fix avatar loading for generic placeholders
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 14:42:21 +01:00
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
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
4b24dea6c7
only ship minimized js files
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-31 12:28:22 +01:00
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
61db8615f4
preserve line breaks
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-30 11:10:04 +01:00
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
bd951e926f
avatar css fixes
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 12:34:24 +02:00
eace507043
apply our theming
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-27 00:32:47 +02:00
aa2fd30775
autocomplete on demand
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-26 15:25:24 +02:00
112b0d57a8
Comments Autoloader
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-10-24 20:40:11 +02:00
43e498844e
Use ::class in test mocks
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-24 17:45:32 +02:00
1860190305
[tx-robot] updated from transifex
2017-10-24 00:08:45 +00:00
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
fb40afc4d4
enable autocomplete when editing comments
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 18:00:39 +02:00
eb8f1247fe
fix unstable comment order
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-23 15:37:36 +02:00
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
de8a475b0b
fix contactsmenu-popup
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:34 +02:00
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
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
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
d1afbedc5f
setup atwho autocomplete
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
8e60a2bd28
add At.js and dependencies
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:14:33 +02:00
04fafdd505
fix class name in info.xml
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:37 +02:00
8722458d2a
ensure that sorting is stable
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-10-22 14:13:37 +02:00
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
436daf92e5
[tx-robot] updated from transifex
2017-10-07 00:08:31 +00:00
3d981c0d40
[tx-robot] updated from transifex
2017-10-04 00:08:27 +00:00
8be053516b
[tx-robot] updated from transifex
2017-09-30 00:08:25 +00:00
e5d39e63d1
[tx-robot] updated from transifex
2017-09-28 00:08:36 +00:00
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
5ce3c7003b
[tx-robot] updated from transifex
2017-09-13 00:08:12 +00:00
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
7b8bd8188e
[tx-robot] updated from transifex
2017-08-25 00:08:59 +00:00
6b978ebd29
[tx-robot] updated from transifex
2017-08-19 00:08:26 +00:00
c9612b9324
[tx-robot] updated from transifex
2017-08-11 00:08:20 +00:00
8549fcf6e4
[tx-robot] updated from transifex
2017-08-09 00:08:20 +00:00
201bbb962c
Fix Comments
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-08-01 08:20:16 +02:00
d95b46ffb7
[tx-robot] updated from transifex
2017-07-24 00:08:01 +00:00
ce7c62d9bb
[tx-robot] updated from transifex
2017-07-22 00:08:07 +00:00
125767265d
[tx-robot] updated from transifex
2017-07-17 00:08:02 +00:00
a23cdd04bb
[tx-robot] updated from transifex
2017-07-15 00:08:54 +00:00
3865c77279
[tx-robot] updated from transifex
2017-07-14 00:08:37 +00:00
261513b04a
[tx-robot] updated from transifex
2017-07-13 00:08:31 +00:00
13295c2d1d
[tx-robot] updated from transifex
2017-07-12 00:08:43 +00:00
cf8db31bce
[tx-robot] updated from transifex
2017-07-09 00:08:31 +00:00
b4deba2078
Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails
...
Use PNGs for icons in activity emails
2017-07-07 11:05:00 +02:00
146c699eb4
[tx-robot] updated from transifex
2017-06-21 00:08:15 +00:00
90fa27694a
Use PNG version of the icons for shipped activities
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 13:48:51 +02:00
26d6c4a64a
[tx-robot] updated from transifex
2017-06-17 00:08:26 +00:00
74654288e6
[tx-robot] updated from transifex
2017-06-16 00:08:44 +00:00
7a269ae872
[tx-robot] updated from transifex
2017-06-15 00:08:40 +00:00
dc61fb999d
[tx-robot] updated from transifex
2017-06-14 00:08:39 +00:00
ea64cb0028
[tx-robot] updated from transifex
2017-06-13 00:08:22 +00:00
a74901fce1
[tx-robot] updated from transifex
2017-06-08 00:08:26 +00:00
bb884c341f
[tx-robot] updated from transifex
2017-06-06 00:08:45 +00:00
8801b68d45
[tx-robot] updated from transifex
2017-06-01 00:08:38 +00:00
b9b7f8bede
[tx-robot] updated from transifex
2017-05-30 00:08:44 +00:00
4be17dff0f
[tx-robot] updated from transifex
2017-05-29 00:08:33 +00:00
6cc26efbc5
[tx-robot] updated from transifex
2017-05-24 00:08:22 +00:00
9c8a838624
[tx-robot] updated from transifex
2017-05-23 00:08:29 +00:00
3ec9d91bd0
Split multi-author entries
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:39:49 +02:00
bc8fbc1a67
Bump app versions as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:35:25 +02:00
fdfe8f7f15
Adjust version requirement
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-22 10:32:05 +02:00
15f7fe022b
Merge pull request #4554 from nextcloud/pointer-cursor-on-clickable-user
...
Make it clear that you can now click on usernames
2017-05-16 16:29:09 +02:00
fb78774eb8
[tx-robot] updated from transifex
2017-05-10 00:08:31 +00:00
0db3a413b3
Fix mentioned user not clickable after posting or editing a comment
...
The contactsMenu plugin was called on avatar elements from
_postRenderItem, which is called when a new comment is added to the
collection. Due to this contactsMenu was not called when messages were
edited; when a new comment is posted _postRenderItem is called, but at
that time the "mentions" attribute is not filled yet, so "@username" is
not replaced by avatars in the message and thus contactsMenu has no
avatars to be called on.
Calling contactsMenu was moved to a new method, _postRenderMessage,
which is called from _postRenderItem and from the success callback when
fetching the model in _onSubmitSuccess (which replaces "@username" by
avatars in the message after posting or editing a comment).
Fixes #4555
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 22:24:33 +02:00
002018d8ad
Add missing unit tests for comments with mentions
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-05-08 21:55:22 +02:00
2152d5f1f6
[tx-robot] updated from transifex
2017-05-01 00:07:32 +00:00
5bc593a92c
Make it clear that you can now click on usernames
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-27 15:33:16 +02:00
6d7714f182
fix CommentsTabsView js test
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:15 +02:00
897bd5cfef
add contactsmenu popover to comments
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-04-26 09:28:14 +02:00
e5fe41e16b
[tx-robot] updated from transifex
2017-04-26 00:07:43 +00:00
5be1010d45
Fix invalid character
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-04-25 11:06:27 +02:00
4004e39f75
Move systemtags and comments to new accesslist functions
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-04-20 14:34:28 +02:00
adf316c3af
[tx-robot] updated from transifex
2017-04-20 00:07:36 +00:00
c40b7acb09
[tx-robot] updated from transifex
2017-04-18 20:47:45 +00:00
df2235c71f
[tx-robot] updated from transifex
2017-04-17 00:07:33 +00:00
0f96d5a641
[tx-robot] updated from transifex
2017-04-14 00:07:36 +00:00
f984cf0987
[tx-robot] updated from transifex
2017-03-30 00:07:41 +00:00
6309b9ec1d
[tx-robot] updated from transifex
2017-03-28 00:07:53 +00:00
d9ebc2626f
[tx-robot] updated from transifex
2017-03-27 00:07:55 +00:00
0981f9a18a
[tx-robot] updated from transifex
2017-03-26 01:07:03 +00:00
bdd71b6081
Merge JS for comments
...
Shaves off 6 requests.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 19:49:43 +01:00
40228c0c2b
added quit option in commentstabview.js
...
added quit option in notif in app.js
added quit option in notif in file-upload.js
added quit option in notif in fileinfomodel.js
added quit option in notif in filelist.js
added quit option in notif in filelist.js
added quit option in notif in tagsplugin.js
added quit option in notif in statusmanager.js
added quit option in notif in external.js
added quit option in notif in versionstabview.js
added quit option in notif in notification.js
changes according to the latest review.
timeout removed since there is a button to close it
translation capability added
typo fixed
test files updated
small errors fixed
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 13:12:29 -06:00
9e1e7dac47
[tx-robot] updated from transifex
2017-03-18 01:07:50 +00:00
37fcc41004
[tx-robot] updated from transifex
2017-03-12 01:08:05 +00:00
d4200a08cc
Get the user folder of the correct user
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-09 21:07:37 +01:00
53195b156c
[tx-robot] updated from transifex
2017-03-02 16:48:52 +00:00
aecec74a04
[tx-robot] updated from transifex
2017-03-01 01:07:42 +00:00
556b958af2
[tx-robot] updated from transifex
2017-02-25 01:25:07 +00:00
47c6a8019f
[tx-robot] updated from transifex
2017-02-16 01:07:44 +00:00
41276f720b
[tx-robot] updated from transifex
2017-02-15 01:07:29 +00:00
c5dffc465c
Merge pull request #3472 from nextcloud/enable-avatars-always
...
Always enable avatars
2017-02-14 09:22:02 -06:00
7113af3f91
[tx-robot] updated from transifex
2017-02-14 01:07:20 +00:00
200a28255e
Always enable avatars
...
* we introduced this setting in the begining because our
avatar support caused some performance issues, but we
fixed them and should only provide one way how Nextcloud
looks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-13 17:53:33 -06:00
5e4bbb394c
[tx-robot] updated from transifex
2017-02-07 01:08:50 +00:00
b946ec9d6c
[tx-robot] updated from transifex
2017-02-02 01:07:05 +00:00
1952560ac7
[tx-robot] updated from transifex
2017-02-01 01:06:57 +00:00
05e3aa491a
[tx-robot] updated from transifex
2017-01-26 01:07:15 +00:00
30e9d67ee9
[tx-robot] updated from transifex
2017-01-24 01:07:14 +00:00
d0c6179ec1
[tx-robot] updated from transifex
2017-01-21 01:07:47 +00:00
c35ea15916
[tx-robot] updated from transifex
2017-01-11 15:20:22 +00:00
bb84db02cb
Cleanup comment tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 12:03:34 +01:00
e675c2a66c
Set the comment link on render instead of creation
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-09 11:18:33 +01:00
4f9ff96f79
[tx-robot] updated from transifex
2017-01-09 08:24:58 +00:00
2e0cf21f7f
[tx-robot] updated from transifex
2017-01-04 12:09:43 +00:00
acad4ba93e
[tx-robot] updated from transifex
2017-01-03 01:07:46 +00:00
fdf10e242d
Merge pull request #2850 from nextcloud/downstream-26603
...
Fixed size issues on main detail view and disappearing of share recipients (#26603 )
2017-01-02 21:19:43 +01:00
5c50df72b7
[tx-robot] updated from transifex
2017-01-01 01:07:30 +00:00
b399ad2fee
[tx-robot] updated from transifex
2016-12-28 01:07:41 +00:00
754760fdbe
mention property to follow same style
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2016-12-23 17:01:58 +01:00
Nextcloud bot
Joas Schilling
Arthur Schiwon
Julius Härtl
Roeland Jago Douma
Morris Jobke
Roeland Jago Douma
Daniel Calviño Sánchez
John Molakvoæ (skjnldsv)
Abijeet
rakekniven
Lukas Reschke
Allan Nordhøy
Jan-Christoph Borchardt
Georg Ehrke
noveens