wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
43758 commits 157 branches 562 tags 714 MiB
Commit graph

450 commits

Author SHA1 Message Date
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
Nextcloud bot
6b978ebd29
[tx-robot] updated from transifex 2017-08-19 00:08:26 +00:00
Nextcloud bot
c9612b9324
[tx-robot] updated from transifex 2017-08-11 00:08:20 +00:00
Nextcloud bot
8549fcf6e4
[tx-robot] updated from transifex 2017-08-09 00:08:20 +00:00
Roeland Jago Douma
201bbb962c
Fix Comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:16 +02:00
Nextcloud bot
d95b46ffb7
[tx-robot] updated from transifex 2017-07-24 00:08:01 +00:00
Nextcloud bot
ce7c62d9bb
[tx-robot] updated from transifex 2017-07-22 00:08:07 +00:00
Nextcloud bot
125767265d
[tx-robot] updated from transifex 2017-07-17 00:08:02 +00:00
Nextcloud bot
a23cdd04bb
[tx-robot] updated from transifex 2017-07-15 00:08:54 +00:00
Nextcloud bot
3865c77279
[tx-robot] updated from transifex 2017-07-14 00:08:37 +00:00
Nextcloud bot
261513b04a
[tx-robot] updated from transifex 2017-07-13 00:08:31 +00:00
Nextcloud bot
13295c2d1d
[tx-robot] updated from transifex 2017-07-12 00:08:43 +00:00
Nextcloud bot
cf8db31bce
[tx-robot] updated from transifex 2017-07-09 00:08:31 +00:00
Morris Jobke
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