summaryrefslogtreecommitdiffstats
path: root/apps/comments
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-11-308-0/+14
|
* Merge pull request #7316 from ↵Roeland Jago Douma2017-11-291-3/+3
|\ | | | | | | | | nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251 Fix silent conflicts due to merging #7256 after #7251
| * Fix silent conflicts due to merging #7256 after #7251Daniel Calviño Sánchez2017-11-281-3/+3
| | | | | | | | | | | | | | | | | | 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>
* | [tx-robot] updated from transifexNextcloud bot2017-11-2912-0/+24
| |
* | [tx-robot] updated from transifexNextcloud bot2017-11-28112-334/+334
|/
* Merge pull request #7256 from ↵blizzz2017-11-272-11/+34
|\ | | | | | | | | nextcloud/fix-cursor-for-avatar-and-user-names-in-comments Fix cursor for avatar and user names in comments
| * Replace with non-deprecated JS callLukas Reschke2017-11-271-1/+1
| | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * Disable contacts menu for mentions to current user in comment messagesDaniel Calviño Sánchez2017-11-272-4/+9
| | | | | | | | | | | | | | | | | | 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>
| * Disable contacts menu for mentioned users in comments being composedDaniel Calviño Sánchez2017-11-272-7/+14
| | | | | | | | | | | | | | 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>
| * Fix cursor for author row and avatars in commentsDaniel Calviño Sánchez2017-11-262-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #7266 from ↵Morris Jobke2017-11-271-3/+3
|\ \ | | | | | | | | | | | | nextcloud/fix-input-field-not-disabled-while-a-comment-is-being-sent Fix input field not disabled while a comment is being sent
| * | Fix input field not disabled while a comment is being sentDaniel Calviño Sánchez2017-11-231-3/+3
| |/ | | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #7280 from ↵Morris Jobke2017-11-272-2/+18
|\ \ | | | | | | | | | | | | nextcloud/fix-working-icon-position-when-sending-or-deleting-a-comment Fix working icon position when sending or deleting a comment
| * | Show delete working icon at the same position as the delete iconDaniel Calviño Sánchez2017-11-242-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Show submit working icon at the same position as the submit confirm iconDaniel Calviño Sánchez2017-11-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #7251 from nextcloud/contact-menu-position-fixMorris Jobke2017-11-271-9/+14
|\ \ \ | | | | | | | | Fixed contact menu position on comments
| * | | Fixed alignment of items in commentsJohn Molakvoæ (skjnldsv)2017-11-231-8/+13
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fix contacts menu vertical position for comment authorsDaniel Calviño Sánchez2017-11-231-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | 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>
* | | Fix unit testsMorris Jobke2017-11-272-3/+3
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | that has since been deleted, ID to nodeAllan Nordhøy2017-11-271-3/+3
| |/ |/| | | | | | | | | You were mentioned in a group chat by a user that has since been deleted Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Disable elements while a comment is being deletedDaniel Calviño Sánchez2017-11-242-2/+13
|/ | | | | | | | | | 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>
* Force breaks on extremely long wordsDaniel Calviño Sánchez2017-11-171-0/+2
| | | | | | If not broken extremely long words overflow their container. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* [tx-robot] updated from transifexNextcloud bot2017-11-1112-14/+334
|
* [tx-robot] updated from transifexNextcloud bot2017-11-1010-0/+330
|
* [tx-robot] updated from transifexNextcloud bot2017-11-082-2/+56
|
* [tx-robot] updated from transifexNextcloud bot2017-11-072-0/+66
|
* Update license headersMorris Jobke2017-11-0615-26/+52
| | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Add variable for border-radiusJan-Christoph Borchardt2017-11-031-1/+1
| | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* [tx-robot] updated from transifexNextcloud bot2017-11-034-0/+132
|
* update autoloaderArthur Schiwon2017-11-012-0/+4
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge branch 'master' into autocomplete-guiArthur Schiwon2017-11-0115-23/+722
|\
| * Merge pull request #6875 from nextcloud/app_autoloadersJoas Schilling2017-11-019-0/+619
| |\ | | | | | | Move server apps to dedicated autoloader
| | * Comments AutoloaderRoeland Jago Douma2017-10-249-0/+619
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Merge pull request #6849 from ↵blizzz2017-10-311-0/+6
| |\ \ | | |/ | |/| | | | | | | nextcloud/fix-missing-translation-of-personal-calendar-in-activity Fix missing translation of "Personal" calendar in activities
| | * Add a doc why this should not be removedJoas Schilling2017-10-231-0/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Use ::class in test mocksMorris Jobke2017-10-242-21/+31
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | [tx-robot] updated from transifexNextcloud bot2017-10-242-0/+66
| | |
| * | Box-shadow does not need vendor prefix anymoreMorris Jobke2017-10-231-2/+0
| |/ | | | | | | | | | | | | 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>
* | adjust jsunit testsArthur Schiwon2017-11-012-9/+14
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | fix avatar loading for generic placeholdersArthur Schiwon2017-10-311-1/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | remove more vendor-imported files that aren't necessaryArthur Schiwon2017-10-318-260/+0
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | simplify registration of manager in server containerArthur Schiwon2017-10-311-1/+2
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | only ship minimized js filesArthur Schiwon2017-10-31154-35552/+0
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | fix comment sorterArthur Schiwon2017-10-303-8/+32
| | | | | | | | | | | | | | 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>
* | preserve line breaksArthur Schiwon2017-10-301-0/+10
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | configurable amount of autocomplete results in commentsArthur Schiwon2017-10-274-1/+126
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | avatar css fixesArthur Schiwon2017-10-271-2/+10
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | apply our themingArthur Schiwon2017-10-274-5/+95
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | autocomplete on demandArthur Schiwon2017-10-261-13/+19
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | enable autocomplete when editing commentsArthur Schiwon2017-10-231-49/+75
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>